Browse Source

more updated variable formatting and accommodation of the YAML parser being a fussbudget

Alex Payne 11 years ago
parent
commit
f7f7157cec

+ 1
- 1
roles/common/tasks/encfs.yml View File

1
 - name: Install encfs & fuse
1
 - name: Install encfs & fuse
2
-  apt: pkg=$item state=installed
2
+  apt: pkg={{ item }} state=installed
3
   with_items:
3
   with_items:
4
     - encfs
4
     - encfs
5
     - libfuse-dev
5
     - libfuse-dev

+ 1
- 1
roles/common/tasks/main.yml View File

8
   apt: upgrade=safe
8
   apt: upgrade=safe
9
 
9
 
10
 - name: Install necessities and nice-to-haves
10
 - name: Install necessities and nice-to-haves
11
-  apt: pkg=$item state=installed
11
+  apt: pkg={{ item }} state=installed
12
   with_items:
12
   with_items:
13
     - sudo
13
     - sudo
14
     - vim
14
     - vim

+ 1
- 1
roles/common/tasks/security.yml View File

1
 - name: Install security-related packages
1
 - name: Install security-related packages
2
-  apt: pkg=$item state=installed
2
+  apt: pkg={{ item }} state=installed
3
   with_items:
3
   with_items:
4
     - fail2ban
4
     - fail2ban
5
     - rkhunter
5
     - rkhunter

+ 1
- 1
roles/ircbouncer/tasks/znc.yml View File

1
 # more or less as per http://wiki.znc.in/Running_ZNC_as_a_system_daemon
1
 # more or less as per http://wiki.znc.in/Running_ZNC_as_a_system_daemon
2
 
2
 
3
 - name: Install znc dependencies
3
 - name: Install znc dependencies
4
-  apt: pkg=$item state=installed
4
+  apt: pkg={{ item }} state=installed
5
   with_items:
5
   with_items:
6
     - build-essential
6
     - build-essential
7
     - libssl-dev
7
     - libssl-dev

+ 3
- 3
roles/mailserver/tasks/dovecot.yml View File

1
 - name: Install Dovecot and related packages
1
 - name: Install Dovecot and related packages
2
-  apt: pkg=$item state=installed
2
+  apt: pkg={{ item }} state=installed
3
   with_items:
3
   with_items:
4
     - dovecot-core
4
     - dovecot-core
5
     - dovecot-imapd
5
     - dovecot-imapd
17
 - name: Ensure mail domain directories are in place
17
 - name: Ensure mail domain directories are in place
18
   file: state=directory path=/decrypted/{{ item.name }} owner=vmail group=dovecot mode=770
18
   file: state=directory path=/decrypted/{{ item.name }} owner=vmail group=dovecot mode=770
19
   with_items:
19
   with_items:
20
-    - {{ mail_virtual_domains }}
20
+    - "{{ mail_virtual_domains }}"
21
 
21
 
22
 - name: Ensure mail directories are in place
22
 - name: Ensure mail directories are in place
23
   file: state=directory path=/decrypted/{{ item.name }}/{{ item.primary_user }} owner=vmail group=dovecot
23
   file: state=directory path=/decrypted/{{ item.name }}/{{ item.primary_user }} owner=vmail group=dovecot
24
   with_items:
24
   with_items:
25
-    - {{ mail_virtual_domains }}
25
+    - "{{ mail_virtual_domains }}"
26
 
26
 
27
 - name: Copy dovecot.conf into place
27
 - name: Copy dovecot.conf into place
28
   copy: src=etc_dovecot_dovecot.conf dest=/etc/dovecot/dovecot.conf
28
   copy: src=etc_dovecot_dovecot.conf dest=/etc/dovecot/dovecot.conf

+ 2
- 2
roles/mailserver/tasks/dspam.yml View File

1
 - name: Install dspam and related packages
1
 - name: Install dspam and related packages
2
-  apt: pkg=$item state=installed
2
+  apt: pkg={{ item }} state=installed
3
   with_items:
3
   with_items:
4
     - dspam
4
     - dspam
5
     - dovecot-antispam
5
     - dovecot-antispam
32
 - name: Put sieve rules into each primary user directory
32
 - name: Put sieve rules into each primary user directory
33
   copy: src=dot_dovecot.sieve dest=/decrypted/{{ item.name }}/{{ item.primary_user }}/.dovecot.sieve owner=vmail group=dovecot
33
   copy: src=dot_dovecot.sieve dest=/decrypted/{{ item.name }}/{{ item.primary_user }}/.dovecot.sieve owner=vmail group=dovecot
34
   with_items:
34
   with_items:
35
-    - {{ mail_virtual_domains }}
35
+    - "{{ mail_virtual_domains }}"
36
   notify: restart dovecot
36
   notify: restart dovecot

+ 3
- 3
roles/mailserver/tasks/opendkim.yml View File

2
 # Handy reference: http://stevejenkins.com/blog/2010/09/how-to-get-dkim-domainkeys-identified-mail-working-on-centos-5-5-and-postfix-using-opendkim/
2
 # Handy reference: http://stevejenkins.com/blog/2010/09/how-to-get-dkim-domainkeys-identified-mail-working-on-centos-5-5-and-postfix-using-opendkim/
3
 
3
 
4
 - name: Install OpenDKIM and related packages
4
 - name: Install OpenDKIM and related packages
5
-  apt: pkg=$item state=installed
5
+  apt: pkg={{ item }} state=installed
6
   with_items:
6
   with_items:
7
     - opendkim
7
     - opendkim
8
     - opendkim-tools
8
     - opendkim-tools
13
 - name: Create OpenDKIM key directories
13
 - name: Create OpenDKIM key directories
14
   file: state=directory path=/etc/opendkim/keys/{{ item.name }} group=opendkim owner=opendkim
14
   file: state=directory path=/etc/opendkim/keys/{{ item.name }} group=opendkim owner=opendkim
15
   with_items:
15
   with_items:
16
-    - {{ mail_virtual_domains }}
16
+    - "{{ mail_virtual_domains }}"
17
 
17
 
18
 - name: Generate OpenDKIM keys
18
 - name: Generate OpenDKIM keys
19
   command: opendkim-genkey -r -d {{ item.name }} -D /etc/opendkim/keys/{{ item.name }}/ creates=/etc/opendkim/keys/{{ item.name }}/default.private
19
   command: opendkim-genkey -r -d {{ item.name }} -D /etc/opendkim/keys/{{ item.name }}/ creates=/etc/opendkim/keys/{{ item.name }}/default.private
20
   with_items:
20
   with_items:
21
-    - {{ mail_virtual_domains }}
21
+    - "{{ mail_virtual_domains }}"
22
 
22
 
23
 - name: Put opendkim.conf into place
23
 - name: Put opendkim.conf into place
24
   copy: src=etc_opendkim.conf dest=/etc/opendkim.conf owner=opendkim group=opendkim
24
   copy: src=etc_opendkim.conf dest=/etc/opendkim.conf owner=opendkim group=opendkim

+ 1
- 1
roles/mailserver/tasks/postfix.yml View File

1
 - name: Install Postfix and related packages
1
 - name: Install Postfix and related packages
2
-  apt: pkg=$item state=installed
2
+  apt: pkg={{ item }} state=installed
3
   with_items:
3
   with_items:
4
     - postfix
4
     - postfix
5
     - mysql-server
5
     - mysql-server

+ 1
- 1
roles/mailserver/tasks/solr.yml View File

1
 - name: Install Solr and related packages
1
 - name: Install Solr and related packages
2
-  apt: pkg=$item state=installed
2
+  apt: pkg={{ item }} state=installed
3
   with_items:
3
   with_items:
4
     - solr-tomcat
4
     - solr-tomcat
5
     - dovecot-solr
5
     - dovecot-solr

+ 1
- 1
roles/tarsnap/tasks/tarsnap.yml View File

1
 - name: Install dependencies for Tarsnap
1
 - name: Install dependencies for Tarsnap
2
-  apt: pkg=$item state=installed
2
+  apt: pkg={{ item }} state=installed
3
   with_items:
3
   with_items:
4
     - libssl-dev
4
     - libssl-dev
5
     - zlib1g-dev
5
     - zlib1g-dev

+ 1
- 1
roles/webmail/tasks/roundcube.yml View File

1
 - name: Install Roundcube
1
 - name: Install Roundcube
2
-  apt: pkg=$item state=latest
2
+  apt: pkg={{ item }} state=latest
3
   with_items:
3
   with_items:
4
     - roundcube
4
     - roundcube
5
     - roundcube-plugins
5
     - roundcube-plugins

Loading…
Cancel
Save