Merge branch 'main' into mrf_policies

This commit is contained in:
meaz 2023-08-03 10:04:32 +00:00
commit da1cbf0e85
3 changed files with 23 additions and 10 deletions

View File

@ -136,11 +136,12 @@ postgresql_user_privileges:
priv: "ALL" # privilege string format: example: INSERT,UPDATE/table:SELECT/anothertable:ALL
role_attr_flags: "" # role attribute flags
#NGINX SETUP
#NGINX SETUP
nginx_default_vhost_ssl: 'pleroma.example.lan'
nginx_default_vhost: 'pleroma.example.lan'
nginx_HSTS_policy: 'true'
#NGINX VHOST
##NGINX VHOST
nginx_vhosts:
- name: 'pleroma.example.lan'

View File

@ -1,10 +1,13 @@
---
- include_tasks: user.yml
- name: '[Main] - Create user'
include_tasks: user.yml
- include_tasks: installdeps.yml
- name: '[Main] - Install dependencies'
include_tasks: installdeps.yml
- include_tasks: configure.yml
- name: '[Main] - Configure'
include_tasks: configure.yml
tags:
- upgrade
@ -13,14 +16,17 @@
path: '{{ pleroma_app_dir }}/release'
register: pleroma_release
- include_tasks: install.yml
- name: '[Main] - Install'
include_tasks: install.yml
when: pleroma_release.stat.exists == False
- include_tasks: upgrade.yml
- name: '[Main] - Upgrade'
include_tasks: upgrade.yml
tags:
- upgrade
- never
- include_tasks: frontends.yml
- name: '[Main] - Frontends'
include_tasks: frontends.yml
tags:
- upgrade
- upgrade

View File

@ -32,4 +32,10 @@
daemon_reload: 'yes'
tags:
- upgrade
- never
- never
- name: '[Frontends] - Wait 10 seconds after restart of backend to make sure it is completely started'
wait_for:
timeout: 10
tags:
- upgrade