upgraded synapse to 1.18.0 and improved tags overall (dynamic tasks include does not allow fot tags inheritance, had to surround inner tasks with a block defining the tag)
This commit is contained in:
LUXEY Adrien
parent
8acbc4f2b2
commit
801575ea38
10 changed files with 262 additions and 230 deletions
|
|
@ -17,7 +17,7 @@ wordpress:
|
|||
gitea:
|
||||
version: 1.12.1
|
||||
synapse:
|
||||
version: v1.15.1-py3
|
||||
version: v1.18.0
|
||||
|
||||
postgres:
|
||||
pg_hba_path: "/etc/postgresql/9.6/main/pg_hba.conf"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
---
|
||||
|
||||
- block: # Used for tagging all tasks with "drupal"
|
||||
|
||||
- name: "Set site_data_path to {{ www_path }}/{{ site.slug }}"
|
||||
set_fact: site_data_path="{{ www_path }}/{{ site.slug }}"
|
||||
tags: always
|
||||
|
|
@ -63,3 +66,5 @@
|
|||
# https://www.digitalocean.com/community/tutorials/how-to-acquire-a-let-s-encrypt-certificate-using-ansible-on-ubuntu-18-04
|
||||
# Maybe using shell directly? e.g.
|
||||
# certbot certonly --webroot -w /var/www/letsencrypt -d <url>
|
||||
|
||||
tags: drupal # /block
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
---
|
||||
|
||||
- block: # Used for tagging all tasks with "gitea"
|
||||
|
||||
- name: "Set site_data_path to {{ www_path }}/{{ site.slug }}"
|
||||
set_fact: site_data_path="{{ www_path }}/{{ site.slug }}"
|
||||
tags: always
|
||||
|
|
@ -27,3 +30,4 @@
|
|||
import_tasks: backup.yml
|
||||
tags: backup
|
||||
|
||||
tags: gitea # / block
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
loop_control:
|
||||
loop_var: site
|
||||
when: site.type == "wordpress"
|
||||
tags: wordpress,sites
|
||||
tags: wordpress
|
||||
|
||||
- name: Build Drupal sites
|
||||
include_tasks: drupal.yml
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
loop_control:
|
||||
loop_var: site
|
||||
when: site.type == "drupal"
|
||||
tags: drupal,sites
|
||||
tags: drupal
|
||||
|
||||
- name: Build Gitea sites
|
||||
include_tasks: gitea.yml
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
loop_control:
|
||||
loop_var: site
|
||||
when: site.type == "gitea"
|
||||
tags: gitea,sites
|
||||
tags: gitea
|
||||
|
||||
- name: Build Synapse sites
|
||||
include_tasks: synapse.yml
|
||||
|
|
@ -30,4 +30,4 @@
|
|||
loop_control:
|
||||
loop_var: site
|
||||
when: site.type == "synapse"
|
||||
tags: synapse,sites
|
||||
tags: synapse
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
---
|
||||
- block: # Used for tagging all tasks with "synapse"
|
||||
|
||||
- name: "Set site_data_path to {{ www_path }}/{{ site.slug }}"
|
||||
set_fact: site_data_path="{{ www_path }}/{{ site.slug }}"
|
||||
tags: always
|
||||
|
||||
####################
|
||||
# Render templates #
|
||||
|
|
@ -15,20 +16,19 @@
|
|||
# Generate configuration #
|
||||
##########################
|
||||
|
||||
- block: # Used for tagging all tasks with "config"
|
||||
- name: "Create folder {{ site_data_path }}"
|
||||
file:
|
||||
path: "{{ site_data_path }}"
|
||||
state: directory
|
||||
mode: "770"
|
||||
group: "www-data"
|
||||
tags: config
|
||||
|
||||
- name: "Copy homeserver.yaml to {{ site_data_path }}"
|
||||
copy:
|
||||
src: "{{ sites_path }}/{{ site.slug }}/homeserver.yaml"
|
||||
dest: "{{ site_data_path }}/homeserver.yaml"
|
||||
remote_src: yes
|
||||
tags: config
|
||||
|
||||
- name: "Let synapse generate missing configuration files"
|
||||
docker_container:
|
||||
|
|
@ -60,3 +60,5 @@
|
|||
- name: "Setup backups"
|
||||
import_tasks: backup.yml
|
||||
tags: backup
|
||||
|
||||
tags: synapse # / block
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
---
|
||||
|
||||
- block: # Used for tagging all tasks with "wordpress"
|
||||
|
||||
- name: "Set site_data_path to {{ www_path }}/{{ site.slug }}_wp-content"
|
||||
set_fact: site_data_path="{{ www_path }}/{{ site.slug }}_wp-content"
|
||||
tags: always
|
||||
|
|
@ -97,3 +100,5 @@
|
|||
# https://www.digitalocean.com/community/tutorials/how-to-acquire-a-let-s-encrypt-certificate-using-ansible-on-ubuntu-18-04
|
||||
# Maybe using shell directly? e.g.
|
||||
# certbot certonly --webroot -w /var/www/letsencrypt -d <url>
|
||||
|
||||
tags: wordpress # / block
|
||||
|
|
@ -2,10 +2,14 @@
|
|||
# Needs variables:
|
||||
# - site: dict describing the site install (cf group_vars/all/vars.yml)
|
||||
|
||||
- block: # Used for tagging all tasks with "drupal"
|
||||
|
||||
- name: Include nginx tasks
|
||||
include_tasks: nginx.yml
|
||||
import_tasks: nginx.yml
|
||||
tags: nginx
|
||||
|
||||
- name: Include docker tasks
|
||||
include_tasks: docker.yml
|
||||
import_tasks: docker.yml
|
||||
tags: docker
|
||||
|
||||
tags: drupal
|
||||
|
|
@ -2,10 +2,14 @@
|
|||
# Needs variables:
|
||||
# - site: dict describing the site install (cf group_vars/all/vars.yml)
|
||||
|
||||
- block: # Used for tagging all tasks with "gitea"
|
||||
|
||||
- name: Include docker tasks
|
||||
include_tasks: docker.yml
|
||||
import_tasks: docker.yml
|
||||
tags: docker
|
||||
|
||||
- name: Include nginx tasks
|
||||
include_tasks: nginx.yml
|
||||
import_tasks: nginx.yml
|
||||
tags: nginx
|
||||
|
||||
tags: gitea
|
||||
|
|
@ -2,10 +2,14 @@
|
|||
# Needs variables:
|
||||
# - site: dict describing the site install (cf group_vars/all/vars.yml)
|
||||
|
||||
- block: # Used for tagging all tasks with "synapse"
|
||||
|
||||
- name: Include docker tasks
|
||||
include_tasks: docker.yml
|
||||
import_tasks: docker.yml
|
||||
tags: docker
|
||||
|
||||
- name: Include nginx tasks
|
||||
include_tasks: nginx.yml
|
||||
import_tasks: nginx.yml
|
||||
tags: nginx
|
||||
|
||||
tags: synapse
|
||||
|
|
@ -2,10 +2,14 @@
|
|||
# Needs variables:
|
||||
# - site: dict describing the site install (cf group_vars/all/vars.yml)
|
||||
|
||||
- block: # Used for tagging all tasks with "wordpress"
|
||||
|
||||
- name: Include nginx tasks
|
||||
include_tasks: nginx.yml
|
||||
import_tasks: nginx.yml
|
||||
tags: nginx
|
||||
|
||||
- name: Include docker tasks
|
||||
include_tasks: docker.yml
|
||||
import_tasks: docker.yml
|
||||
tags: docker
|
||||
|
||||
tags: wordpress
|
||||
Loading…
Reference in a new issue