mirror of
https://github.com/cwchristerw/tjas-infra
synced 2025-12-02 18:53:40 +00:00
Compare commits
2 Commits
bc1652d42c
...
778f9017ca
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
778f9017ca | ||
|
|
91bd77479b |
@@ -1 +1 @@
|
||||
Listen 8080
|
||||
Listen 8090
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<VirtualHost *:8080>
|
||||
<VirtualHost *:8090>
|
||||
# The ServerName directive sets the request scheme, hostname and port that
|
||||
# the server uses to identify itself. This is used when creating
|
||||
# redirection URLs. In the context of virtual hosts, the ServerName
|
||||
|
||||
@@ -72,7 +72,7 @@ server {
|
||||
gunzip on;
|
||||
|
||||
location / {
|
||||
proxy_pass http://127.0.0.1:3001;
|
||||
proxy_pass http://127.0.0.1:8080;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_intercept_errors on;
|
||||
proxy_http_version 1.1;
|
||||
@@ -115,7 +115,7 @@ server {
|
||||
gunzip on;
|
||||
|
||||
location / {
|
||||
proxy_pass http://127.0.0.1:3001;
|
||||
proxy_pass http://127.0.0.1:8090;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_intercept_errors on;
|
||||
proxy_http_version 1.1;
|
||||
|
||||
@@ -121,7 +121,6 @@
|
||||
restart_policy: always
|
||||
env:
|
||||
MYSQL_ROOT_PASSWORD: "{{ config.mariadb.users.root.password }}"
|
||||
register: deployerTaskM2
|
||||
when:
|
||||
- (deployerTaskM1 is defined and deployerTaskM1.changed) or deployerTaskM1 is undefined
|
||||
tags:
|
||||
@@ -133,8 +132,6 @@
|
||||
host: "127.0.0.1"
|
||||
port: "3306"
|
||||
delay: 10
|
||||
when:
|
||||
- (deployerTaskM2 is defined and deployerTaskM2.changed) or deployerTaskM2 is undefined
|
||||
tags:
|
||||
- mariadb
|
||||
- database
|
||||
@@ -146,8 +143,6 @@
|
||||
register: task
|
||||
ignore_errors: yes
|
||||
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:
|
||||
- mariadb
|
||||
- database
|
||||
@@ -166,7 +161,6 @@
|
||||
label: "{{ user }}"
|
||||
loop_var: "user"
|
||||
when:
|
||||
- (deployerTaskM2 is defined and deployerTaskM2.changed) or deployerTaskM2 is undefined
|
||||
- config.mariadb.users is defined
|
||||
- config.mariadb.users[user] is defined
|
||||
- config.mariadb.users[user].username is defined
|
||||
@@ -187,7 +181,6 @@
|
||||
label: "{{ user }}"
|
||||
loop_var: "user"
|
||||
when:
|
||||
- (deployerTaskM2 is defined and deployerTaskM2.changed) or deployerTaskM2 is undefined
|
||||
- config.mariadb.users is defined
|
||||
- config.mariadb.users[user] is defined
|
||||
- config.mariadb.users[user].username is defined
|
||||
|
||||
Reference in New Issue
Block a user