diff --git a/roles/n8n/defaults/main.yml b/roles/n8n/defaults/main.yml index cb9b157..d0d298b 100644 --- a/roles/n8n/defaults/main.yml +++ b/roles/n8n/defaults/main.yml @@ -1,7 +1,7 @@ --- # Version to deploy -n8n_version: 0.197.1 +n8n_version: 0.200.0 # Root directory where n8n will be installed n8n_root_dir: /opt/n8n # User account under which n8n will run diff --git a/roles/samba/handlers/main.yml b/roles/samba/handlers/main.yml index 020ce41..99249e0 100644 --- a/roles/samba/handlers/main.yml +++ b/roles/samba/handlers/main.yml @@ -5,3 +5,7 @@ name: "{{ (samba_role == 'dc' or samba_role == 'rodc') | ternary('samba','smb') }}" state: reloaded +- name: reload winbind + service: name=winbind state=reloaded + when: samba_role == 'member' + diff --git a/roles/samba/tasks/conf.yml b/roles/samba/tasks/conf.yml index 95b8944..dd8c28c 100644 --- a/roles/samba/tasks/conf.yml +++ b/roles/samba/tasks/conf.yml @@ -85,7 +85,9 @@ dest: /etc/samba/smb.conf - src: sysconfig.j2 dest: /etc/sysconfig/samba - notify: reload samba + notify: + - reload samba + - reload winbind tags: samba - name: Check if there's a shares.conf snippet diff --git a/roles/samba/templates/samba_post_backup.sh.j2 b/roles/samba/templates/samba_post_backup.sh.j2 index 1aa1166..da29435 100644 --- a/roles/samba/templates/samba_post_backup.sh.j2 +++ b/roles/samba/templates/samba_post_backup.sh.j2 @@ -1,3 +1,9 @@ #!/bin/sh +set -eo pipefail + +{% if samba_role in ['dc', 'rodc'] %} rm -rf /home/lbkp/samba +{% else %} +echo "Samba not running as a domain controller, no dump to remove" +{% endif %} diff --git a/roles/samba/templates/samba_pre_backup.sh.j2 b/roles/samba/templates/samba_pre_backup.sh.j2 index bba9986..0bb603d 100644 --- a/roles/samba/templates/samba_pre_backup.sh.j2 +++ b/roles/samba/templates/samba_pre_backup.sh.j2 @@ -2,6 +2,7 @@ set -eo pipefail +{% if samba_role in ['dc', 'rodc'] %} LDB_MODULES_PATH=/usr/lib64/samba/ldb export LDB_MODULES_PATH @@ -20,3 +21,6 @@ for LDIF in $(find /var/lib/samba/private/ -type f -name \*.ldb); do done # Also take a more standard offline backup samba-tool domain backup offline --targetdir=/home/lbkp/samba/offline/ +{% else %} +echo "Samba isn't running as a domain controller, nothing to backup" +{% endif %}