From 45835d334915f78bb5e15c289006c69d2d6c027d Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Fri, 16 Oct 2020 15:25:49 +0200 Subject: [PATCH 1/5] nextcloud: Install version 20 instead of 19 --- webapps/nextcloud/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/nextcloud/defaults/main.yml b/webapps/nextcloud/defaults/main.yml index 0048ca69..cb8b70a0 100644 --- a/webapps/nextcloud/defaults/main.yml +++ b/webapps/nextcloud/defaults/main.yml @@ -1,6 +1,6 @@ --- nextcloud_webserver: 'nginx' -nextcloud_version: "19.0.0" +nextcloud_version: "20.0.0" nextcloud_archive_name: "nextcloud-{{ nextcloud_version }}.tar.bz2" nextcloud_releases_baseurl: "https://download.nextcloud.com/server/releases/" From 995cb6d9a2308675ebeef8c534284d08294b6df6 Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Fri, 16 Oct 2020 15:33:52 +0200 Subject: [PATCH 2/5] dovecot: Update munin plugin & configure it --- dovecot/files/munin_config | 2 ++ dovecot/files/munin_plugin | 22 ++++++++++++---------- dovecot/tasks/munin.yml | 8 +++++--- 3 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 dovecot/files/munin_config diff --git a/dovecot/files/munin_config b/dovecot/files/munin_config new file mode 100644 index 00000000..1a0553d8 --- /dev/null +++ b/dovecot/files/munin_config @@ -0,0 +1,2 @@ +[dovecot] +group adm diff --git a/dovecot/files/munin_plugin b/dovecot/files/munin_plugin index e5a6d1d1..f12c2b04 100755 --- a/dovecot/files/munin_plugin +++ b/dovecot/files/munin_plugin @@ -2,21 +2,22 @@ # # Munin Plugin # to count logins to your dovecot mailserver -# +# # Created by Dominik Schulz # http://developer.gauner.org/munin/ # Contributions by: # - Stephane Enten # - Steve Schnepp -# +# - pcy (make 'Connected Users' DERIVE, check existence of logfile in autoconf) +# # Parameters understood: # # config (required) # autoconf (optional - used by munin-config) -# +# # Config variables: # -# logfile - Where to find the syslog file +# logfile - Where to find the syslog file # # Add the following line to a file in /etc/munin/plugin-conf.d: # env.logfile /var/log/your/logfile.log @@ -34,13 +35,13 @@ LOGFILE=${logfile:-/var/log/mail.log} ###################### if [ "$1" = "autoconf" ]; then - echo yes + [ -f "$LOGFILE" ] && echo yes || echo "no (logfile $LOGFILE not found)" exit 0 fi if [ "$1" = "config" ]; then echo 'graph_title Dovecot Logins' - echo 'graph_category Mail' + echo 'graph_category mail' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel Login Counters' @@ -53,6 +54,7 @@ if [ "$1" = "config" ]; then done echo 'connected.label Connected Users' + echo "connected.type DERIVE" exit 0 fi @@ -86,7 +88,7 @@ echo -n echo -en "login_tls.value " VALUE=$(egrep -c '[dovecot]?.*Login.*TLS' $LOGFILE) if [ ! -z "$VALUE" ]; then - echo "$VALUE" + echo "$VALUE" else echo "0" fi @@ -97,7 +99,7 @@ echo -n echo -en "login_ssl.value " VALUE=$(egrep -c '[dovecot]?.*Login.*SSL' $LOGFILE) if [ ! -z "$VALUE" ]; then - echo "$VALUE" + echo "$VALUE" else echo "0" fi @@ -108,7 +110,7 @@ echo -n echo -en "login_imap.value " VALUE=$(egrep -c '[dovecot]?.*imap.*Login' $LOGFILE) if [ ! -z "$VALUE" ]; then - echo "$VALUE" + echo "$VALUE" else echo "0" fi @@ -119,7 +121,7 @@ echo -n echo -en "login_pop3.value " VALUE=$(egrep -c '[dovecot]?.*pop3.*Login' $LOGFILE) if [ ! -z "$VALUE" ]; then - echo "$VALUE" + echo "$VALUE" else echo "0" fi diff --git a/dovecot/tasks/munin.yml b/dovecot/tasks/munin.yml index 21d17519..c6b58d28 100644 --- a/dovecot/tasks/munin.yml +++ b/dovecot/tasks/munin.yml @@ -14,8 +14,10 @@ dest: /etc/munin/plugins/dovecot mode: "0755" -# TODO : add in /etc/munin/plugin-conf.d/munin-node -# [dovecot] -# group adm + - name: Install munin config + copy: + src: munin_config + dest: /etc/munin/plugin-conf.d/dovecot + mode: "0644" when: munin_node_plugins_config.stat.exists From d80461e39a128a3598a460662192db632b0289e0 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 19 Oct 2020 16:03:58 +0200 Subject: [PATCH 3/5] redis: variable to force use of port 6379 in instances mode --- CHANGELOG.md | 1 + redis/defaults/main.yml | 2 ++ redis/tasks/instance-server.yml | 1 + 3 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b83ea994..ef8a7c7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The **patch** part changes incrementally at each release. ### Added * nextcloud: New role to setup a nextcloud instance +* redis: variable to force use of port 6379 in instances mode ### Changed diff --git a/redis/defaults/main.yml b/redis/defaults/main.yml index 6fc0b4c3..5cd311ce 100644 --- a/redis/defaults/main.yml +++ b/redis/defaults/main.yml @@ -3,6 +3,8 @@ redis_systemd_name: redis-server redis_conf_dir_prefix: /etc/redis +redis_force_instance_port: False + redis_port: 6379 redis_bind_interface: 127.0.0.1 diff --git a/redis/tasks/instance-server.yml b/redis/tasks/instance-server.yml index 6437567c..5f4b2601 100644 --- a/redis/tasks/instance-server.yml +++ b/redis/tasks/instance-server.yml @@ -5,6 +5,7 @@ that: - redis_port != 6379 msg: "If you want to use port 6379, use the default instance, not a named instance." + when: not redis_force_instance_port - name: "Instance '{{ redis_instance_name }}' group is present" group: From 9e5d041210a8138809618a376e1ca5cd5f33e0ec Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Fri, 16 Oct 2020 15:35:13 +0200 Subject: [PATCH 4/5] dovecot: Update munin plugin & configure it --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef8a7c7d..1bff9a4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The **patch** part changes incrementally at each release. ### Added +* dovecot: Update munin plugin & configure it * nextcloud: New role to setup a nextcloud instance * redis: variable to force use of port 6379 in instances mode From c8d4da532f619da1a6b2aa76f27d7c0ad6d4254b Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Tue, 20 Oct 2020 10:58:51 +0200 Subject: [PATCH 5/5] evoacme: Don't ignore hooks with . in the name (ignore when it's ".disable") --- CHANGELOG.md | 2 ++ evoacme/files/evoacme.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bff9a4d..07f1e37f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ The **patch** part changes incrementally at each release. ### Changed +* evoacme: Don't ignore hooks with . in the name (ignore when it's ".disable") + ### Fixed ### Removed diff --git a/evoacme/files/evoacme.sh b/evoacme/files/evoacme.sh index e8330748..6db0cab7 100755 --- a/evoacme/files/evoacme.sh +++ b/evoacme/files/evoacme.sh @@ -287,7 +287,7 @@ main() { # search for files in hooks directory for hook in $(find ${HOOKS_DIR} -type f -executable | sort); do # keep only executables files, not containing a "." - if [ -x "${hook}" ] && (basename "${hook}" | grep -vqF "."); then + if [ -x "${hook}" ] && (basename "${hook}" | grep -vqF ".disable"); then debug "Executing ${hook}" ${hook} fi