Release 10.0.0 #100

Manually merged
jlecour merged 321 commits from unstable into stable 2020-05-13 11:25:49 +02:00
2 changed files with 7 additions and 6 deletions
Showing only changes of commit 031c4c29b9 - Show all commits

View file

@ -17,6 +17,7 @@ The **patch** part changes incrementally at each release.
### Fixed
* lxc-php: Don't remove the default pool
* roundcube: fix typo for roundcube vhost
### Security

View file

@ -88,7 +88,7 @@
- name: deploy apache roundcube vhost
template:
src: apache2.conf.j2
dest: /etc/apache2/sites-available/rouncube.conf
dest: /etc/apache2/sites-available/roundcube.conf
mode: "0640"
notify: reload apache2
when: roundcube_webserver == "apache"
@ -97,8 +97,8 @@
- name: enable apache roundcube vhost
file:
src: /etc/apache2/sites-available/rouncube.conf
dest: /etc/apache2/sites-enabled/rouncube.conf
src: /etc/apache2/sites-available/roundcube.conf
dest: /etc/apache2/sites-enabled/roundcube.conf
state: link
notify: reload apache2
when: roundcube_webserver == "apache"
@ -108,14 +108,14 @@
- name: deploy Nginx roundcube vhost
template:
src: nginx.conf.j2
dest: /etc/nginx/sites-available/rouncube.conf
dest: /etc/nginx/sites-available/roundcube.conf
when: roundcube_webserver == "nginx"
notify: reload nginx
- name: enable Nginx roundcube vhost
file:
src: "/etc/nginx/sites-available/rouncube.conf"
dest: "/etc/nginx/sites-enabled/rouncube.conf"
src: "/etc/nginx/sites-available/roundcube.conf"
dest: "/etc/nginx/sites-enabled/roundcube.conf"
state: link
when: roundcube_webserver == "nginx"
notify: reload nginx