samsapti/lab-ansible
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix stuff after testing

Browse source
This commit is contained in:
Sam A. 2023-12-28 00:00:12 +01:00
parent f9b7abd0b0
commit 40d196c100
Signed by: samsapti
GPG key ID: CBBBE7371E81C4EA
8 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
group_vars/app_prod/vars.yml
View file

@ -4,4 +4,4 @@
apps_base_domain: sapti.me apps_base_domain: sapti.me
db_inventory_hostname: sapt-labp-db01 db_inventory_hostname: sapt-labp-db01
db_host: "{{ hostvars[db_inventory_hostname].fqdn }}" db_host: "{{ hostvars[db_inventory_hostname].internal_ipv4 }}"

2
group_vars/app_stage/vars.yml
View file

@ -4,4 +4,4 @@
apps_base_domain: staging.sapti.me apps_base_domain: staging.sapti.me
db_inventory_hostname: sapt-labs-db01 db_inventory_hostname: sapt-labs-db01
db_host: "{{ hostvars[db_inventory_hostname].fqdn }}" db_host: "{{ hostvars[db_inventory_hostname].internal_ipv4 }}"

4
roles/apps/templates/compose-files/nextcloud.yml.j2
View file

@ -15,9 +15,9 @@ services:
image: nextcloud:{{ apps_vars.nextcloud.version }} image: nextcloud:{{ apps_vars.nextcloud.version }}
restart: always restart: always
environment: environment:
POSTGRES_HOST: "{{ db_host }}" POSTGRES_HOST: {{ db_host }}
POSTGRES_DB: nextcloud POSTGRES_DB: nextcloud
POSTGRES_USER: "{{ databases.nextcloud.username }}" POSTGRES_USER: {{ databases.nextcloud.username }}
POSTGRES_PASSWORD: {{ databases.nextcloud.password }} POSTGRES_PASSWORD: {{ databases.nextcloud.password }}
REDIS_HOST: redis REDIS_HOST: redis
REDIS_HOST_PASSWORD: {{ redis_passwords.nextcloud }} REDIS_HOST_PASSWORD: {{ redis_passwords.nextcloud }}

2
roles/apps/templates/nginx/conf.d/ipfs.conf.j2
View file

@ -6,6 +6,7 @@ server {
server_name {{ apps_vars.ipfs.domain }}; server_name {{ apps_vars.ipfs.domain }};
location / { location / {
resolver 127.0.0.11 valid=30s;
set $upstream http://ipfs:5001; set $upstream http://ipfs:5001;
proxy_pass $upstream; proxy_pass $upstream;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@ -18,6 +19,7 @@ server {
server_name ~^([\w-]+\.(ipfs|ipns)\.)?{{ apps_vars.ipfs.gateway_domain }}$; server_name ~^([\w-]+\.(ipfs|ipns)\.)?{{ apps_vars.ipfs.gateway_domain }}$;
location / { location / {
resolver 127.0.0.11 valid=30s;
set $upstream http://ipfs:8080; set $upstream http://ipfs:8080;
proxy_pass $upstream; proxy_pass $upstream;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

1
roles/apps/templates/nginx/conf.d/monerod.conf.j2
View file

@ -6,6 +6,7 @@ server {
server_name {{ apps_vars.monerod.domain }}; server_name {{ apps_vars.monerod.domain }};
location / { location / {
resolver 127.0.0.11 valid=30s;
set $upstream http://monerod:18089; set $upstream http://monerod:18089;
proxy_pass $upstream; proxy_pass $upstream;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

1
roles/apps/templates/nginx/conf.d/nextcloud.conf.j2
View file

@ -6,6 +6,7 @@ server {
server_name {{ apps_vars.nextcloud.domain }}; server_name {{ apps_vars.nextcloud.domain }};
location / { location / {
resolver 127.0.0.11 valid=30s;
set $upstream http://nextcloud:80; set $upstream http://nextcloud:80;
proxy_pass $upstream; proxy_pass $upstream;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

2
roles/postgresql/tasks/main.yml
View file

@ -46,7 +46,7 @@
ansible.builtin.file: ansible.builtin.file:
path: "{{ postgresql_pgdata }}" path: "{{ postgresql_pgdata }}"
owner: postgres owner: postgres
mode: u=rwx,g=rx,o=rx mode: u=rwx,go=
state: directory state: directory
- name: Initialize database - name: Initialize database

1
roles/postgresql/templates/postgresql.conf.j2
View file

@ -9,6 +9,7 @@ dynamic_shared_memory_type = posix
password_encryption = scram-sha-256 password_encryption = scram-sha-256
datestyle = 'iso, mdy' datestyle = 'iso, mdy'
timezone = '{{ timezone }}' timezone = '{{ timezone }}'
logging_collector = on
log_timezone = '{{ timezone }}' log_timezone = '{{ timezone }}'
lc_messages = 'en_US.utf8' lc_messages = 'en_US.utf8'
lc_monetary = 'en_US.utf8' lc_monetary = 'en_US.utf8'