Browse Source

Merge branch 'unstable' into packweb-multi-php2

pull/116/head
Mathieu Trossevin 4 months ago
parent
commit
71f85a5863
Signed by: mtrossevin GPG Key ID: D1DBB7EA828374E9
8 changed files with 28 additions and 15 deletions
  1. +4
    -0
      CHANGELOG.md
  2. +2
    -0
      dovecot/files/munin_config
  3. +12
    -10
      dovecot/files/munin_plugin
  4. +5
    -3
      dovecot/tasks/munin.yml
  5. +1
    -1
      evoacme/files/evoacme.sh
  6. +2
    -0
      redis/defaults/main.yml
  7. +1
    -0
      redis/tasks/instance-server.yml
  8. +1
    -1
      webapps/nextcloud/defaults/main.yml

+ 4
- 0
CHANGELOG.md View File

@ -12,11 +12,15 @@ 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
* lxc-php: Allow php containers to contact local MySQL with localhost
### Changed
* evoacme: Don't ignore hooks with . in the name (ignore when it's ".disable")
### Fixed
### Removed


+ 2
- 0
dovecot/files/munin_config View File

@ -0,0 +1,2 @@
[dovecot]
group adm

+ 12
- 10
dovecot/files/munin_plugin View File

@ -2,21 +2,22 @@
#
# Munin Plugin
# to count logins to your dovecot mailserver
#
#
# Created by Dominik Schulz <lkml@ds.gauner.org>
# http://developer.gauner.org/munin/
# Contributions by:
# - Stephane Enten <tuf@delyth.net>
# - Steve Schnepp <steve.schnepp@pwkf.org>
#
# - pcy <pcy@ulyssis.org> (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


+ 5
- 3
dovecot/tasks/munin.yml View File

@ -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

+ 1
- 1
evoacme/files/evoacme.sh View File

@ -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


+ 2
- 0
redis/defaults/main.yml View File

@ -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


+ 1
- 0
redis/tasks/instance-server.yml View File

@ -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:


+ 1
- 1
webapps/nextcloud/defaults/main.yml View File

@ -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/"


Loading…
Cancel
Save