cwchristerw/tjas-infra
1
0
Fork 0
mirror of https://github.com/cwchristerw/tjas-infra synced 2025-12-02 19:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: cwchristerw:bc1652d42c805e90e5262a06005195fce8709633
Branches Tags
cwchristerw:master
...
compare: cwchristerw:778f9017cab2a766916742579387e8f0001e1ff4
Branches Tags
cwchristerw:master

2 Commits
bc1652d42c ... 778f9017ca

Author SHA1 Message Date
Christer Warén
778f9017ca Fix overlapping ports 2025-09-14 14:28:05 +03:00
Christer Warén
91bd77479b Fix issue with not adding new MariaDB users and databases in Deployer 2025-09-14 14:16:20 +03:00
4 changed files with 4 additions and 11 deletions
Expand all files Collapse all files

2
files/nextcloud/config/apache2/ports.conf
View File

@@ -1 +1 @@
Listen 8080 Listen 8090

2
files/nextcloud/config/apache2/sites-enabled/000-default.conf
View File

@@ -1,4 +1,4 @@
<VirtualHost *:8080> <VirtualHost *:8090>
# The ServerName directive sets the request scheme, hostname and port that # The ServerName directive sets the request scheme, hostname and port that
# the server uses to identify itself. This is used when creating # the server uses to identify itself. This is used when creating
# redirection URLs. In the context of virtual hosts, the ServerName # redirection URLs. In the context of virtual hosts, the ServerName

4
files/nginx/conf/001-services.conf
View File

@@ -72,7 +72,7 @@ server {
gunzip on; gunzip on;
location / { location / {
proxy_pass http://127.0.0.1:3001; proxy_pass http://127.0.0.1:8080;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_intercept_errors on; proxy_intercept_errors on;
proxy_http_version 1.1; proxy_http_version 1.1;
@@ -115,7 +115,7 @@ server {
gunzip on; gunzip on;
location / { location / {
proxy_pass http://127.0.0.1:3001; proxy_pass http://127.0.0.1:8090;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_intercept_errors on; proxy_intercept_errors on;
proxy_http_version 1.1; proxy_http_version 1.1;

7
tasks/deployer.yml
View File

@@ -121,7 +121,6 @@
restart_policy: always restart_policy: always
env: env:
MYSQL_ROOT_PASSWORD: "{{ config.mariadb.users.root.password }}" MYSQL_ROOT_PASSWORD: "{{ config.mariadb.users.root.password }}"
register: deployerTaskM2
when: when:
- (deployerTaskM1 is defined and deployerTaskM1.changed) or deployerTaskM1 is undefined - (deployerTaskM1 is defined and deployerTaskM1.changed) or deployerTaskM1 is undefined
tags: tags:
@@ -133,8 +132,6 @@
host: "127.0.0.1" host: "127.0.0.1"
port: "3306" port: "3306"
delay: 10 delay: 10
when:
- (deployerTaskM2 is defined and deployerTaskM2.changed) or deployerTaskM2 is undefined
tags: tags:
- mariadb - mariadb
- database - database
@@ -146,8 +143,6 @@
register: task register: task
ignore_errors: yes ignore_errors: yes
changed_when: task.stdout.find("This installation of MariaDB is already upgraded") == -1 changed_when: task.stdout.find("This installation of MariaDB is already upgraded") == -1
when:
- (deployerTaskM2 is defined and deployerTaskM2.changed) or deployerTaskM2 is undefined
tags: tags:
- mariadb - mariadb
- database - database
@@ -166,7 +161,6 @@
label: "{{ user }}" label: "{{ user }}"
loop_var: "user" loop_var: "user"
when: when:
- (deployerTaskM2 is defined and deployerTaskM2.changed) or deployerTaskM2 is undefined
- config.mariadb.users is defined - config.mariadb.users is defined
- config.mariadb.users[user] is defined - config.mariadb.users[user] is defined
- config.mariadb.users[user].username is defined - config.mariadb.users[user].username is defined
@@ -187,7 +181,6 @@
label: "{{ user }}" label: "{{ user }}"
loop_var: "user" loop_var: "user"
when: when:
- (deployerTaskM2 is defined and deployerTaskM2.changed) or deployerTaskM2 is undefined
- config.mariadb.users is defined - config.mariadb.users is defined
- config.mariadb.users[user] is defined - config.mariadb.users[user] is defined
- config.mariadb.users[user].username is defined - config.mariadb.users[user].username is defined