Browse Source

Fix syntax for "removes" options

Sven Neuhaus 10 years ago
parent
commit
0a164d519f

+ 2
- 4
roles/blog/tasks/blog.yml View File

2
   file: state=directory path=/var/www/{{ domain }} group=www-data owner=www-data
2
   file: state=directory path=/var/www/{{ domain }} group=www-data owner=www-data
3
 
3
 
4
 - name: Rename existing Apache blog virtualhost
4
 - name: Rename existing Apache blog virtualhost
5
-  command: mv /etc/apache2/sites-available/{{ domain }} /etc/apache2/sites-available/{{ domain }}.conf
6
-  removes: /etc/apache2/sites-available/{{ domain }}
5
+  command: mv /etc/apache2/sites-available/{{ domain }} /etc/apache2/sites-available/{{ domain }}.conf removes=/etc/apache2/sites-available/{{ domain }}
7
 
6
 
8
 - name: Remove old sites-enabled/{{ domain }} symlink (new one will be created by a2ensite)
7
 - name: Remove old sites-enabled/{{ domain }} symlink (new one will be created by a2ensite)
9
-  command: rm /etc/apache2/sites-enabled/{{ domain }}
10
-  removes: /etc/apache2/sites-enabled/{{ domain }}
8
+  command: rm /etc/apache2/sites-enabled/{{ domain }} removes=/etc/apache2/sites-enabled/{{ domain }}
11
 
9
 
12
 - name: Configure the Apache HTTP server for the blog
10
 - name: Configure the Apache HTTP server for the blog
13
   template: src=etc_apache2_sites-available_blog.j2 dest=/etc/apache2/sites-available/{{ domain }}.conf group=root owner=root
11
   template: src=etc_apache2_sites-available_blog.j2 dest=/etc/apache2/sites-available/{{ domain }}.conf group=root owner=root

+ 2
- 4
roles/git/tasks/cgit.yml View File

33
             owner=www-data
33
             owner=www-data
34
 
34
 
35
 - name: Rename existing Apache cgit virtualhost
35
 - name: Rename existing Apache cgit virtualhost
36
-  command: mv /etc/apache2/sites-available/cgit /etc/apache2/sites-available/cgit.conf
37
-  removes: /etc/apache2/sites-available/cgit
36
+  command: mv /etc/apache2/sites-available/cgit /etc/apache2/sites-available/cgit.conf removes=/etc/apache2/sites-available/cgit
38
 
37
 
39
 - name: Remove old sites-enabled/cgit symlink (new one will be created by a2ensite)
38
 - name: Remove old sites-enabled/cgit symlink (new one will be created by a2ensite)
40
-  command: rm /etc/apache2/sites-enabled/cgit
41
-  removes: /etc/apache2/sites-enabled/cgit
39
+  command: rm /etc/apache2/sites-enabled/cgit removes=/etc/apache2/sites-enabled/cgit
42
 
40
 
43
 - name: Configure the Apache HTTP server for cgit
41
 - name: Configure the Apache HTTP server for cgit
44
   template: src=etc_apache2_sites-available_cgit.j2
42
   template: src=etc_apache2_sites-available_cgit.j2

+ 2
- 4
roles/newebe/tasks/main.yml View File

73
 #
73
 #
74
 
74
 
75
 - name: Rename existing Apache newebe virtualhost
75
 - name: Rename existing Apache newebe virtualhost
76
-  command: mv /etc/apache2/sites-available/newebe /etc/apache2/sites-available/newebe.conf
77
-  removes: /etc/apache2/sites-available/newebe
76
+  command: mv /etc/apache2/sites-available/newebe /etc/apache2/sites-available/newebe.conf removes=/etc/apache2/sites-available/newebe
78
 
77
 
79
 - name: Remove old sites-enabled/newebe symlink (new one will be created by a2ensite)
78
 - name: Remove old sites-enabled/newebe symlink (new one will be created by a2ensite)
80
-  command: rm /etc/apache2/sites-enabled/newebe
81
-  removes: /etc/apache2/sites-enabled/newebe
79
+  command: rm /etc/apache2/sites-enabled/newebe removes=/etc/apache2/sites-enabled/newebe
82
 
80
 
83
 - name: Configure the Apache HTTP server for Newebe
81
 - name: Configure the Apache HTTP server for Newebe
84
   template: src=etc_apache2_sites-available_newebe.j2
82
   template: src=etc_apache2_sites-available_newebe.j2

+ 2
- 4
roles/news/tasks/selfoss.yml View File

27
   notify: restart apache
27
   notify: restart apache
28
 
28
 
29
 - name: Rename existing Apache blog virtualhost
29
 - name: Rename existing Apache blog virtualhost
30
-  command: mv /etc/apache2/sites-available/selfoss /etc/apache2/sites-available/selfoss.conf
31
-  removes: /etc/apache2/sites-available/selfoss
30
+  command: mv /etc/apache2/sites-available/selfoss /etc/apache2/sites-available/selfoss.conf removes=/etc/apache2/sites-available/selfoss
32
 
31
 
33
 - name: Remove old sites-enabled/selfoss symlink (new one will be created by a2ensite)
32
 - name: Remove old sites-enabled/selfoss symlink (new one will be created by a2ensite)
34
-  command: rm /etc/apache2/sites-enabled/selfoss
35
-  removes: /etc/apache2/sites-enabled/selfoss
33
+  command: rm /etc/apache2/sites-enabled/selfoss removes=/etc/apache2/sites-enabled/selfoss
36
 
34
 
37
 - name: Configure the Apache HTTP server for selfoss
35
 - name: Configure the Apache HTTP server for selfoss
38
   template: src=etc_apache2_sites-available_selfoss.j2 dest=/etc/apache2/sites-available/selfoss.conf group=root owner=root
36
   template: src=etc_apache2_sites-available_selfoss.j2 dest=/etc/apache2/sites-available/selfoss.conf group=root owner=root

+ 2
- 4
roles/owncloud/tasks/owncloud.yml View File

45
   notify: restart apache
45
   notify: restart apache
46
 
46
 
47
 - name: Rename existing Apache owncloud virtualhost
47
 - name: Rename existing Apache owncloud virtualhost
48
-  command: mv /etc/apache2/sites-available/owncloud /etc/apache2/sites-available/owncloud.conf
49
-  removes: /etc/apache2/sites-available/owncloud
48
+  command: mv /etc/apache2/sites-available/owncloud /etc/apache2/sites-available/owncloud.conf removes=/etc/apache2/sites-available/owncloud
50
 
49
 
51
 - name: Remove old sites-enabled/owncloud symlink (new one will be created by a2ensite)
50
 - name: Remove old sites-enabled/owncloud symlink (new one will be created by a2ensite)
52
-  command: rm /etc/apache2/sites-enabled/owncloud
53
-  removes: /etc/apache2/sites-enabled/owncloud
51
+  command: rm /etc/apache2/sites-enabled/owncloud removes=/etc/apache2/sites-enabled/owncloud
54
 
52
 
55
 - name: Configure the Apache HTTP server for ownCloud
53
 - name: Configure the Apache HTTP server for ownCloud
56
   template: src=etc_apache2_sites-available_owncloud.j2 dest=/etc/apache2/sites-available/owncloud.conf group=root owner=root
54
   template: src=etc_apache2_sites-available_owncloud.j2 dest=/etc/apache2/sites-available/owncloud.conf group=root owner=root

+ 2
- 4
roles/readlater/tasks/wallabag.yml View File

53
             group=www-data
53
             group=www-data
54
 
54
 
55
 - name: Rename existing Apache wallabag virtualhost
55
 - name: Rename existing Apache wallabag virtualhost
56
-  command: mv /etc/apache2/sites-available/wallabag /etc/apache2/sites-available/wallabag.conf
57
-  removes: /etc/apache2/sites-available/wallabag
56
+  command: mv /etc/apache2/sites-available/wallabag /etc/apache2/sites-available/wallabag.conf removes=/etc/apache2/sites-available/wallabag
58
 
57
 
59
 - name: Remove old sites-enabled/wallabag symlink (new one will be created by a2ensite)
58
 - name: Remove old sites-enabled/wallabag symlink (new one will be created by a2ensite)
60
-  command: rm /etc/apache2/sites-enabled/wallabag
61
-  removes: /etc/apache2/sites-enabled/wallabag
59
+  command: rm /etc/apache2/sites-enabled/wallabag removes=/etc/apache2/sites-enabled/wallabag
62
 
60
 
63
 - name: Configure the Apache HTTP server for wallabag
61
 - name: Configure the Apache HTTP server for wallabag
64
   template: src=etc_apache2_sites-available_wallabag.j2
62
   template: src=etc_apache2_sites-available_wallabag.j2

+ 2
- 4
roles/webmail/tasks/roundcube.yml View File

33
     - twofactor_gauthenticator
33
     - twofactor_gauthenticator
34
 
34
 
35
 - name: Rename existing Apache roundcube virtualhost
35
 - name: Rename existing Apache roundcube virtualhost
36
-  command: mv /etc/apache2/sites-available/roundcube /etc/apache2/sites-available/roundcube.conf
37
-  removes: /etc/apache2/sites-available/roundcube
36
+  command: mv /etc/apache2/sites-available/roundcube /etc/apache2/sites-available/roundcube.conf removes=/etc/apache2/sites-available/roundcube
38
 
37
 
39
 - name: Remove old sites-enabled/roundcube symlink (new one will be created by a2ensite)
38
 - name: Remove old sites-enabled/roundcube symlink (new one will be created by a2ensite)
40
-  command: rm /etc/apache2/sites-enabled/roundcube
41
-  removes: /etc/apache2/sites-enabled/roundcube
39
+  command: rm /etc/apache2/sites-enabled/roundcube removes=/etc/apache2/sites-enabled/roundcube
42
 
40
 
43
 - name: Configure the Apache HTTP server for roundcube
41
 - name: Configure the Apache HTTP server for roundcube
44
   template: src=etc_apache2_sites-available_roundcube.j2 dest=/etc/apache2/sites-available/roundcube.conf group=root owner=root force=yes
42
   template: src=etc_apache2_sites-available_roundcube.j2 dest=/etc/apache2/sites-available/roundcube.conf group=root owner=root force=yes

Loading…
Cancel
Save