diff --git a/inventory/hosts.yml b/inventory/hosts.yml index 3f4d03b..241ec31 100644 --- a/inventory/hosts.yml +++ b/inventory/hosts.yml @@ -46,11 +46,9 @@ all: children: db: hosts: - psql1.9iron.club: psql1.desu.ltd: web: hosts: - web1.9iron.club: web1.desu.ltd: web2.desu.ltd: game: diff --git a/playbooks/db.yml b/playbooks/db.yml index 1c4a39e..eafbbbd 100755 --- a/playbooks/db.yml +++ b/playbooks/db.yml @@ -46,53 +46,3 @@ - name: peertube owner: peertube-cowfee tags: [ db, psql ] -- hosts: psql1.9iron.club - roles: - - role: backup - tags: [ backup ] - - role: motd - vars: - motd_watch_services_extra: - - postgresql - tags: [ motd ] - - role: postgresql - vars: - postgresql_hba_entries: - - { type: local, database: all, user: postgres, auth_method: peer } - - { type: local, database: all, user: all, auth_method: md5 } - - { type: host, database: all, user: all, address: '127.0.0.1/32', auth_method: md5 } - - { type: host, database: all, user: all, address: '::1/128', auth_method: md5 } - - { type: host, database: all, user: all, address: '172.31.0.0/16', auth_method: md5 } - postgresql_users: - - name: gitea - password: "{{ secret_gitea_9iron_db_pass }}" - - name: nextcloud - password: "{{ secret_nextcloud_9iron_db_pass }}" - - name: onlyoffice-9iron - password: "{{ secret_onlyoffice_9iron_db_pass }}" - - name: pleroma - password: "{{ secret_pleroma_9iron_db_pass }}" - - name: matrix - password: "{{ secret_matrix_9iron_db_pass }}" - postgresql_databases: - - name: gitea - lc_collate: C.UTF-8 - lc_ctype: C.UTF-8 - owner: gitea - - name: nextcloud - lc_collate: C.UTF-8 - lc_ctype: C.UTF-8 - owner: nextcloud - - name: onlyoffice-9iron - lc_collate: C.UTF-8 - lc_ctype: C.UTF-8 - owner: onlyoffice-9iron - - name: pleroma - lc_collate: C.UTF-8 - lc_ctype: C.UTF-8 - owner: pleroma - - name: matrix - lc_collate: C - lc_ctype: C - owner: matrix - tags: [ db, psql ] diff --git a/playbooks/web.yml b/playbooks/web.yml index 6092867..e9eceef 100755 --- a/playbooks/web.yml +++ b/playbooks/web.yml @@ -109,49 +109,6 @@ tags: [ web, nextcloud ] # - role: gitea # tags: [ web, gitea ] -- hosts: web1.9iron.club - tasks: - - name: configure nextcloud cronjob - cron: user=www-data name=nextcloud minute=*/5 job="php -f /var/www/nextcloud/cron.php" - tags: [ nextcloud, cron ] - - name: mount nextcloud efs - mount: path=/var/nextcloud src=fs-03dc657b.efs.us-east-2.amazonaws.com:/ fstype=nfs4 opts="nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2,noresvport" state=mounted - tags: [ nextcloud, efs ] - - name: mount gitea efs - mount: path=/var/gitea src=fs-b5d56ccd.efs.us-east-2.amazonaws.com:/ fstype=nfs4 opts="nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2,noresvport" state=mounted - tags: [ gitea, efs ] - vars_files: - - vars/apache.yml - - vars/php-fpm.yml - - vars/9iron-apache.yml - - vars/9iron-certbot.yml - - vars/9iron-gitea.yml - roles: - - role: backup - vars: - backup_s3backup_list_extra: - - /var/gitea - - /var/lib/gitea - - /var/nextcloud - - /var/www/nextcloud - backup_s3backup_exclude_list_extra: - - /var/lib/gitea/log - tags: [ backup ] - - role: motd - vars: - motd_watch_services_extra: - - apache2 - - gitea - - php7.4-fpm - tags: [ motd ] - - role: gitea - tags: [ web, gitea ] - - role: php - tags: [ web, php ] - - role: apache - tags: [ web, apache ] - - role: certbot - tags: [ web, certbot ] - hosts: web2.desu.ltd module_defaults: docker_container: