salt/ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Initial attempt at getting web1 up

Browse Source
This commit is contained in:
Salt 2020-12-18 02:25:16 -06:00
parent 5b635e5b68
commit 0f49adf860
2 changed files with 110 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inventory/group_vars/all.yml
View File

@ -62,3 +62,10 @@ secret_nextcloud_db_pass: !vault |
6538383936643664370a663737333861303132313031373234396562653464653838343836663530 6538383936643664370a663737333861303132313031373234396562653464653838343836663530
38396663633237383764613139346333636432613464356465663661653265323135363032633963 38396663633237383764613139346333636432613464356465663661653265323135363032633963
3335626335353431616365313232346431313439653132303833 3335626335353431616365313232346431313439653132303833
secret_nextcloud_admin_pass: !vault |
$ANSIBLE_VAULT;1.1;AES256
66303362626535386438633666376264313563323034343938363034353435306463613364366636
3633343332643062633265643838346465623362323866610a666237636461376166373938626538
62326334356339326330623336363038323431363266306265386635343432383764623437386462
3534643731333331320a393462323264666135666134336536633639613065363339333131653433
37653732313664356330356139646336353735613336326563366361383737653538

210
site.yml
View File

@ -75,110 +75,106 @@
become: yes become: yes
tags: [ db, psql ] tags: [ db, psql ]
# Webservers # Webservers
- hosts: web1.desu.ltd
# NOTE: This whole stanza has been commented out pending resolution of https://github.com/ansible/ansible/issues/71528 roles:
# Currently, no release packages this fix. I NEED that fix out to work around this bug in 20.04 - role: apache
vars:
#- hosts: web1.desu.ltd apache_remove_default_vhost: yes
# roles: apache_packages_state: latest
# - role: certbot apache_mods_enabled:
# vars: - ssl.load
# certbot_admin_email: rehashedsalt@cock.li - proxy.load
# certbot_create_if_missing: yes - proxy_http.load
# certbot_create_method: standalone - rewrite.load
# certbot_create_standalone_stop_services: apache_vhosts:
# - apache2 - servername: git.test.desu.ltd
# certbot_certs: extra_parameters: |
# - domains: ProxyPreserveHost On
# - desu.ltd ProxyRequests Off
# - git.desu.ltd ProxyPass / http://127.0.0.1:3000/ nocanon retry=1
# - nc.desu.ltd - servername: nc.test.desu.ltd
# - web1.desu.ltd documentroot: /var/www/html/nextcloud
# become: yes - servername: test.desu.ltd
# tags: [ web, certbot ] documentroot: /var/www/html/desu.ltd
# - role: apache become: yes
# vars: tags: [ web, apache ]
# apache_remove_default_vhost: yes - role: certbot
# apache_packages_state: latest vars:
# apache_mods_enabled: certbot_admin_email: rehashedsalt@cock.li
# - ssl.load certbot_create_if_missing: yes
# - proxy.load certbot_create_method: standalone
# - proxy_http.load certbot_create_standalone_stop_services:
# - rewrite.load - apache2
# apache_vhosts: certbot_certs:
# - servername: git.test.desu.ltd - domains:
# extra_parameters: | - desu.ltd
# ProxyPreserveHost On - git.desu.ltd
# ProxyRequests Off - nc.desu.ltd
# ProxyPass / http://127.0.0.1:3000/ nocanon retry=1 - web1.desu.ltd
# - servername: nc.test.desu.ltd become: yes
# documentroot: /var/www/html/nextcloud tags: [ web, certbot ]
# - servername: test.desu.ltd - role: php
# documentroot: /var/www/html/desu.ltd vars:
# become: yes php_memory_limit: 512M
# tags: [ web, apache ] php_packages_extra:
# - role: php - libapache2-mod-php
# vars: - php-zip # For Nextcloud
# php_memory_limit: 512M - php-intl
# php_packages_extra: - php-imagick
# - libapache2-mod-php - php-redis
# - php-zip # For Nextcloud - php-bcmath
# - php-intl - php-gmp
# - php-imagick - php-pgsql # For general DB stuff
# - php-redis # Nextcloud recommended opcache settings
# - php-bcmath php_opcache_max_accelerated_files: 10000
# - php-gmp php_opcache_memory_consumption: 128
# - php-pgsql # For general DB stuff php_opcache_revalidate_freq: 2
# # Nextcloud recommended opcache settings become: yes
# php_opcache_max_accelerated_files: 10000 tags: [ web, php ]
# php_opcache_memory_consumption: 128 - role: git
# php_opcache_revalidate_freq: 2 vars:
# become: yes git_repos:
# tags: [ web, php ] - repo: https://git.9iron.club/salt/desultd
# - role: git dest: /var/www/html/desu.ltd
# vars: become: yes
# git_repos: tags: [ web, git ]
# - repo: https://git.9iron.club/salt/desultd - role: nextcloud
# dest: /var/www/html/desu.ltd vars:
# become: yes nextcloud_admin_user: admin
# tags: [ web, git ] nextcloud_admin_pass: "{{ secret_nextcloud_admin_pass }}"
# - role: nextcloud nextcloud_version: 19
# vars: nextcloud_urls:
# nextcloud_admin_user: admin - http://nc.test.desu.ltd:80
# nextcloud_admin_pass: foobar nextcloud_config:
# nextcloud_version: 19 system:
# nextcloud_urls: trusted_domains:
# - http://nc.test.desu.ltd:80 "{{ nextcloud_urls | map('urlsplit', 'hostname') | list }}"
# nextcloud_config: nextcloud_database:
# system: backend: pgsql
# trusted_domains: name: nextcloud
# "{{ nextcloud_urls | map('urlsplit', 'hostname') | list }}" user: nextcloud
# nextcloud_database: pass: "{{ secret_nextcloud_db_pass }}"
# backend: pgsql host: 192.168.122.169
# name: nextcloud port: 5432
# user: nextcloud become: yes
# pass: "{{ secret_nextcloud_db_pass }}" tags: [ web, nextcloud ]
# host: 192.168.122.169 - role: gitea
# port: 5432 vars:
# become: yes # Look and feel
# tags: [ web, nextcloud ] gitea_app_name: "Git Desu"
# - role: gitea # Core config
# vars: gitea_db_type: postgres
# # Look and feel gitea_db_host: 192.168.122.169:5432
# gitea_app_name: "Git Desu" gitea_db_name: gitea
# # Core config gitea_db_user: gitea
# gitea_db_type: postgres gitea_db_password: "{{ secret_gitea_db_pass }}"
# gitea_db_host: 192.168.122.169:5432 gitea_http_domain: git.test.desu.ltd
# gitea_db_name: gitea gitea_oauth2_enabled: no
# gitea_db_user: gitea gitea_root_url: http://git.test.desu.ltd
# gitea_db_password: "{{ secret_gitea_db_pass }}" gitea_shell: "/bin/bash"
# gitea_http_domain: git.test.desu.ltd gitea_ssh_domain: git.test.desu.ltd
# gitea_oauth2_enabled: no gitea_ssh_port: 22
# gitea_root_url: http://git.test.desu.ltd gitea_start_ssh: no
# gitea_shell: "/bin/bash" gitea_user: git
# gitea_ssh_domain: git.test.desu.ltd become: yes
# gitea_ssh_port: 22 tags: [ web, gitea ]
# gitea_start_ssh: no
# gitea_user: git
# become: yes
# tags: [ web, gitea ]