Переглянути джерело

Merge pull request #684 from synchrone/ansible2

Switching to Ansible 2
Allen Riddell 8 роки тому
джерело
коміт
590c316781

+ 1
- 1
requirements.txt Переглянути файл

1
-ansible>=1.9.3,<2
1
+ansible==2.2.2.0

+ 1
- 1
roles/common/tasks/encfs.yml Переглянути файл

21
   when: encfs_check.rc > 0
21
   when: encfs_check.rc > 0
22
 
22
 
23
 - name: If /encrypted isn't empty, mount it (but only if /decrypted/test doesn't exist)
23
 - name: If /encrypted isn't empty, mount it (but only if /decrypted/test doesn't exist)
24
-  shell: printf "{{ encfs_password }}" | encfs /encrypted /decrypted --public --stdinpass creates="/decrypted/test"
24
+  shell: command="printf '{{ encfs_password }}' | encfs /encrypted /decrypted --public --stdinpass" creates="/decrypted/test"
25
   when: encfs_check.rc == 0
25
   when: encfs_check.rc == 0
26
 
26
 
27
 - name: Set decrypted directory permissions
27
 - name: Set decrypted directory permissions

+ 1
- 1
roles/mailserver/tasks/opendmarc.yml Переглянути файл

46
   when: db_created.changed
46
   when: db_created.changed
47
 
47
 
48
 - name: Copy nightly OpenDMARC report generation script into place
48
 - name: Copy nightly OpenDMARC report generation script into place
49
-  template: src=etc_opendmarc_report.sh.j2 dest=/etc/opendmarc/report.sh owner=root group=root mode="755"
49
+  template: src=etc_opendmarc_report.sh.j2 dest=/etc/opendmarc/report.sh owner=root group=root mode="0755"
50
 
50
 
51
 - name: Ensure initial report dat file exists with correct permissions
51
 - name: Ensure initial report dat file exists with correct permissions
52
   copy: content="" dest=/var/run/opendmarc/opendmarc.dat owner=opendmarc group=opendmarc
52
   copy: content="" dest=/var/run/opendmarc/opendmarc.dat owner=opendmarc group=opendmarc

+ 3
- 3
roles/tarsnap/tasks/tarsnap.yml Переглянути файл

70
   command: make all install clean chdir=/root/tarsnap-autoconf-{{ tarsnap_version }} creates=/usr/local/bin/tarsnap
70
   command: make all install clean chdir=/root/tarsnap-autoconf-{{ tarsnap_version }} creates=/usr/local/bin/tarsnap
71
 
71
 
72
 - name: Copy Tarsnap key file into place
72
 - name: Copy Tarsnap key file into place
73
-  copy: src=decrypted_tarsnap.key dest=/decrypted/tarsnap.key owner=root group=root mode="600" force=no
73
+  copy: src=decrypted_tarsnap.key dest=/decrypted/tarsnap.key owner=root group=root mode="0600" force=no
74
 
74
 
75
 - name: Create Tarsnap cache directory
75
 - name: Create Tarsnap cache directory
76
   file: state=directory path=/usr/tarsnap-cache
76
   file: state=directory path=/usr/tarsnap-cache
77
 
77
 
78
 - name: Install Tarsnap configuration file
78
 - name: Install Tarsnap configuration file
79
-  copy: src=tarsnaprc dest=/root/.tarsnaprc mode="644"
79
+  copy: src=tarsnaprc dest=/root/.tarsnaprc mode="0644"
80
 
80
 
81
 - name: Install Tarsnap backup handler script
81
 - name: Install Tarsnap backup handler script
82
-  copy: src=tarsnap.sh dest=/root/tarsnap.sh mode="755"
82
+  copy: src=tarsnap.sh dest=/root/tarsnap.sh mode="0755"
83
 
83
 
84
 - name: Install nightly Tarsnap-generations cronjob
84
 - name: Install nightly Tarsnap-generations cronjob
85
   cron: name="Tarsnap backup" hour="3" minute="0" job="sh /root/tarsnap.sh >> /var/log/tarsnap.log"
85
   cron: name="Tarsnap backup" hour="3" minute="0" job="sh /root/tarsnap.sh >> /var/log/tarsnap.log"

Завантаження…
Відмінити
Зберегти