소스 검색

Merge pull request #684 from synchrone/ansible2

Switching to Ansible 2
Allen Riddell 7 년 전
부모
커밋
590c316781
4개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 1
    1
      requirements.txt
  2. 1
    1
      roles/common/tasks/encfs.yml
  3. 1
    1
      roles/mailserver/tasks/opendmarc.yml
  4. 3
    3
      roles/tarsnap/tasks/tarsnap.yml

+ 1
- 1
requirements.txt 파일 보기

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

+ 1
- 1
roles/common/tasks/encfs.yml 파일 보기

@@ -21,7 +21,7 @@
21 21
   when: encfs_check.rc > 0
22 22
 
23 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 25
   when: encfs_check.rc == 0
26 26
 
27 27
 - name: Set decrypted directory permissions

+ 1
- 1
roles/mailserver/tasks/opendmarc.yml 파일 보기

@@ -46,7 +46,7 @@
46 46
   when: db_created.changed
47 47
 
48 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 51
 - name: Ensure initial report dat file exists with correct permissions
52 52
   copy: content="" dest=/var/run/opendmarc/opendmarc.dat owner=opendmarc group=opendmarc

+ 3
- 3
roles/tarsnap/tasks/tarsnap.yml 파일 보기

@@ -70,16 +70,16 @@
70 70
   command: make all install clean chdir=/root/tarsnap-autoconf-{{ tarsnap_version }} creates=/usr/local/bin/tarsnap
71 71
 
72 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 75
 - name: Create Tarsnap cache directory
76 76
   file: state=directory path=/usr/tarsnap-cache
77 77
 
78 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 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 84
 - name: Install nightly Tarsnap-generations cronjob
85 85
   cron: name="Tarsnap backup" hour="3" minute="0" job="sh /root/tarsnap.sh >> /var/log/tarsnap.log"

Loading…
취소
저장