From d472ee9713d21c5d718b320cc65cabe63aab0249 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 15 Apr 2018 17:32:25 +0200 Subject: [PATCH 1/1] configure root shell from /etc/skel; put conditionals above actions --- base.yml | 14 ++++++++++++-- roles/postfix/tasks/opendkim.yml | 2 +- roles/postfix/tasks/postfix.yml | 6 +++--- site.yml | 1 + 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/base.yml b/base.yml index 0f5be2a..d239483 100644 --- a/base.yml +++ b/base.yml @@ -3,16 +3,16 @@ tasks: # packages - name: check minimal system version - command: "false" when: not (ansible_distribution == "Debian" and ansible_lsb.major_release|int >= 9) + command: "false" - name: detect if we have backports in the sources.list command: fgrep backports /etc/apt/sources.list register: backports failed_when: backports.rc == 2 changed_when: False - name: add backports repository - apt_repository: repo='deb http://httpredir.debian.org/debian {{ansible_distribution_release}}-backports main contrib non-free' state=present update_cache=yes when: backports.rc != 0 + apt_repository: repo='deb http://httpredir.debian.org/debian {{ansible_distribution_release}}-backports main contrib non-free' state=present update_cache=yes - name: get rid of packages we do not want apt: name=exim4-base,rpcbind state=absent autoremove=yes - name: install needrestart (from backports) @@ -25,3 +25,13 @@ dest: /root/server-scripts repo: 'git://ralfj.de/server-scripts' version: 07d301fd8adeaf8ad40591a418da394ad37816ce + # configuration + - name: configure root shell + copy: + dest: /root/{{ item }} + remote_src: True + src: /etc/skel/{{ item }} + loop: + - .profile + - .bashrc + - .bash_logout diff --git a/roles/postfix/tasks/opendkim.yml b/roles/postfix/tasks/opendkim.yml index 49543af..1ac9e5a 100644 --- a/roles/postfix/tasks/opendkim.yml +++ b/roles/postfix/tasks/opendkim.yml @@ -9,8 +9,8 @@ dest: /etc/default/opendkim src: templates/opendkim.env - name: regenerate opendkim service - shell: /lib/opendkim/opendkim.service.generate && systemctl daemon-reload when: opendkim_env.changed + shell: /lib/opendkim/opendkim.service.generate && systemctl daemon-reload notify: opendkim # tables - name: generate opendkim keys diff --git a/roles/postfix/tasks/postfix.yml b/roles/postfix/tasks/postfix.yml index eac650c..b151609 100644 --- a/roles/postfix/tasks/postfix.yml +++ b/roles/postfix/tasks/postfix.yml @@ -1,8 +1,8 @@ - name: install postfix apt: name=postfix,bsd-mailx state=latest - name: install postfix-mysql - apt: name=postfix-mysql state=latest when: postfix.vmail_mysql_password is defined + apt: name=postfix-mysql state=latest - name: enable postfix service: name=postfix enabled=yes # config @@ -15,6 +15,7 @@ - master.cf notify: postfix - name: install postfix mysql config + when: postfix.vmail_mysql_password is defined template: dest: /etc/postfix/{{ item }} src: templates/{{ item }} @@ -25,8 +26,8 @@ - mysql_vmail_senders.cf - mysql_vmail_users.cf notify: postfix - when: postfix.vmail_mysql_password is defined - name: create empty maps + when: postfix.virtual_mailbox_domains is defined copy: dest: /etc/postfix/{{ item }} content: "" @@ -34,7 +35,6 @@ loop: - virtual_alias_map - transport_map - when: postfix.virtual_mailbox_domains is defined # cronjob - name: delete old local-mail cronjob file: path=/etc/cron.daily/local-mail state=absent diff --git a/site.yml b/site.yml index 47d7518..43a2bb2 100644 --- a/site.yml +++ b/site.yml @@ -1,3 +1,4 @@ - import_playbook: base.yml - import_playbook: upgrade.yml - import_playbook: email.yml +- import_playbook: web.yml -- 2.30.2