diff options
| author | Elizabeth Hunt <elizabeth.hunt@simponic.xyz> | 2025-01-02 16:44:54 -0800 |
|---|---|---|
| committer | Elizabeth Hunt <elizabeth.hunt@simponic.xyz> | 2025-01-02 16:54:49 -0800 |
| commit | fe6d55e7881957bc0683eec99d739e2e5488abc5 (patch) | |
| tree | e2994b350af42bf78f99651f91aac0cd5206a4e7 | |
| parent | f8a3722bdf4a573d0976d460be29641af3288f01 (diff) | |
| download | oldinfra-fe6d55e7881957bc0683eec99d739e2e5488abc5.tar.gz oldinfra-fe6d55e7881957bc0683eec99d739e2e5488abc5.zip | |
fix phoneof and service template
| -rwxr-xr-x | create_service.sh | 11 | ||||
| -rw-r--r-- | roles/phoneof/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/phoneof/templates/docker-compose.yml.j2 | 2 | ||||
| -rw-r--r-- | template/database/migrate.go | 2 | ||||
| -rw-r--r-- | template/docker-compose.yml | 2 |
5 files changed, 16 insertions, 7 deletions
diff --git a/create_service.sh b/create_service.sh index acd8a08..cab9af2 100755 --- a/create_service.sh +++ b/create_service.sh @@ -90,12 +90,11 @@ function add_nginx_config() { ssl_prefer_server_ciphers on; location / { - proxy_pass https://127.0.0.1:$SERVICE_PORT; + proxy_pass http://127.0.0.1:$SERVICE_PORT; proxy_http_version 1.1; proxy_set_header Upgrade \$http_upgrade; proxy_set_header Connection \"upgrade\"; proxy_set_header Host \$server_name; - proxy_redirect http:// https://; proxy_buffering off; proxy_set_header X-Real-IP \$remote_addr; proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; @@ -134,6 +133,14 @@ function create_role() { group: root mode: 0700 +- name: ensure $SERVICE db exist + file: + path: /etc/docker/compose/$SERVICE/db + state: directory + owner: root + group: root + mode: 0777 + - name: build $SERVICE docker-compose.yml.j2 template: src: ../templates/docker-compose.yml.j2 diff --git a/roles/phoneof/tasks/main.yml b/roles/phoneof/tasks/main.yml index 082e87e..1ae43b8 100644 --- a/roles/phoneof/tasks/main.yml +++ b/roles/phoneof/tasks/main.yml @@ -7,6 +7,12 @@ group: root mode: 0700 +- name: ensure phoneof db exist + file: + path: /etc/docker/compose/phoneof/db + state: directory + mode: 0777 + - name: build phoneof docker-compose.yml.j2 template: src: ../templates/docker-compose.yml.j2 diff --git a/roles/phoneof/templates/docker-compose.yml.j2 b/roles/phoneof/templates/docker-compose.yml.j2 index ca17e85..0bd6f07 100644 --- a/roles/phoneof/templates/docker-compose.yml.j2 +++ b/roles/phoneof/templates/docker-compose.yml.j2 @@ -12,7 +12,5 @@ services: env_file: .env volumes: - ./db:/app/db - - ./templates:/app/templates - - ./static:/app/static ports: - "127.0.0.1:19191:8080" diff --git a/template/database/migrate.go b/template/database/migrate.go index 8b8712f..64457bc 100644 --- a/template/database/migrate.go +++ b/template/database/migrate.go @@ -13,7 +13,7 @@ type Migrator func(*sql.DB) (*sql.DB, error) func DoNothing(dbConn *sql.DB) (*sql.DB, error) { log.Println("doing nothing") - _, err := dbConn.Exec(`DO NOTHING;`) + _, err := dbConn.Exec(`SELECT 0;`) if err != nil { return dbConn, err } diff --git a/template/docker-compose.yml b/template/docker-compose.yml index 655159d..244783b 100644 --- a/template/docker-compose.yml +++ b/template/docker-compose.yml @@ -12,7 +12,5 @@ services: env_file: .env volumes: - ./db:/app/db - - ./templates:/app/templates - - ./static:/app/static ports: - "127.0.0.1:{{ service_port }}:8080" |