From 46e1366c4fb5032f8abf46d9c85b69403a97ae5d Mon Sep 17 00:00:00 2001 From: Ethan Paul Date: Thu, 23 Dec 2021 23:35:32 -0500 Subject: [PATCH] Update service config spec to include published resources --- .../docker-compose/bitwarden.yaml.j2 | 12 ++++----- .../templates/docker-compose/gitea.yaml.j2 | 2 +- .../templates/docker-compose/vikunja.yaml.j2 | 2 +- skylab/core/playbooks/vars/services.yaml | 27 ++++++++++++++----- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/skylab/core/playbooks/templates/docker-compose/bitwarden.yaml.j2 b/skylab/core/playbooks/templates/docker-compose/bitwarden.yaml.j2 index 54bdaee..e9a99f1 100644 --- a/skylab/core/playbooks/templates/docker-compose/bitwarden.yaml.j2 +++ b/skylab/core/playbooks/templates/docker-compose/bitwarden.yaml.j2 @@ -7,11 +7,11 @@ x-global-env: &globalenv LOCAL_GID: "{{ _app_account.uid }}" ASPNETCORE_ENVIRONMENT: Production globalSettings__selfHosted: "true" - globalSettings__baseServiceUri__vault: https://{{ app.domain }} - globalSettings__baseServiceUri__api: https://{{ app.domain }}/api - globalSettings__baseServiceUri__identity: https://{{ app.domain }}/identity - globalSettings__baseServiceUri__admin: https://{{ app.domain }}/admin - globalSettings__baseServiceUri__notifications: https://{{ app.domain }}/notifications + globalSettings__baseServiceUri__vault: https://{{ app.publish.domain }} + globalSettings__baseServiceUri__api: https://{{ app.publish.domain }}/api + globalSettings__baseServiceUri__identity: https://{{ app.publish.domain }}/identity + globalSettings__baseServiceUri__admin: https://{{ app.publish.domain }}/admin + globalSettings__baseServiceUri__notifications: https://{{ app.publish.domain }}/notifications globalSettings__baseServiceUri__internalNotifications: http://bitwarden_notifications:5000 globalSettings__baseServiceUri__internalAdmin: http://bitwarden_admin:5000 globalSettings__baseServiceUri__internalIdentity: http://bitwarden_identity:5000 @@ -22,7 +22,7 @@ x-global-env: &globalenv globalSettings__sqlServer__connectionString: "Data Source=tcp:mssql,1433;Initial Catalog=vault;Persist Security Info=False;User ID=sa;Password=e934c0bb-3b5a-4e6b-b525-cd6d83004e1a;MultipleActiveResultSets=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=True" globalSettings__identityServer__certificatePassword: {{ app.settings.certificatePassword }} globalSettings__attachment__baseDirectory: /etc/bitwarden/core/attachments - globalSettings__attachment__baseUrl: https://{{ app.domain }}/attachments + globalSettings__attachment__baseUrl: https://{{ app.publish.domain }}/attachments globalSettings__dataProtection__directory: /etc/bitwarden/core/aspnet-dataprotection globalSettings__logDirectory: /etc/bitwarden/logs globalSettings__licenseDirectory: /etc/bitwarden/core/licenses diff --git a/skylab/core/playbooks/templates/docker-compose/gitea.yaml.j2 b/skylab/core/playbooks/templates/docker-compose/gitea.yaml.j2 index e36f744..ef9537f 100644 --- a/skylab/core/playbooks/templates/docker-compose/gitea.yaml.j2 +++ b/skylab/core/playbooks/templates/docker-compose/gitea.yaml.j2 @@ -45,7 +45,7 @@ services: USER_GID: "{{ _app_account.uid }}" APP_NAME: ENP Version Control System RUN_MODE: prod - ROOT_URL: https://{{ app.domain }}/ + ROOT_URL: https://{{ app.publish.domain }}/ DB_TYPE: sqlite3 DISABLE_REGISTRATION: "true" deploy: diff --git a/skylab/core/playbooks/templates/docker-compose/vikunja.yaml.j2 b/skylab/core/playbooks/templates/docker-compose/vikunja.yaml.j2 index 7c23efd..20ebe5f 100644 --- a/skylab/core/playbooks/templates/docker-compose/vikunja.yaml.j2 +++ b/skylab/core/playbooks/templates/docker-compose/vikunja.yaml.j2 @@ -103,6 +103,6 @@ services: - cache - proxy environment: - VIKUNJA_API_URL: https://{{ app.domain }}/api/v1 + VIKUNJA_API_URL: https://{{ app.publish.domain }}/api/v1 deploy: replicas: 1 diff --git a/skylab/core/playbooks/vars/services.yaml b/skylab/core/playbooks/vars/services.yaml index 9d7cf43..592d1e4 100644 --- a/skylab/core/playbooks/vars/services.yaml +++ b/skylab/core/playbooks/vars/services.yaml @@ -18,7 +18,6 @@ skylab_services: minecraft: user: autocraft - domain: mcs.enp.one networks: ext: 192.168.102.0/24 volumes: @@ -27,6 +26,8 @@ skylab_services: 25565: 25565 versions: server: 1.16.5 + publish: + domain: mcs.enp.one settings: admins: - ScifiGeek42 @@ -40,7 +41,6 @@ skylab_services: gitea: user: autotea - domain: vcs.enp.one networks: ext: 192.168.103.0/24 volumes: @@ -48,12 +48,14 @@ skylab_services: ports: 3000: 3000 22: 2222 + publish: + domain: vcs.enp.one + http: 3000 versions: server: 1.15.4 bitwarden: user: autowarden - domain: ssv.enp.one networks: internal: 192.168.104.0/24 external: 192.168.105.0/24 @@ -87,6 +89,9 @@ skylab_services: icons: 1.40.0 events: 1.40.0 nginx: 1.40.0 + publish: + domain: ssv.enp.one + http: 8090 settings: certificatePassword: !vault | $ANSIBLE_VAULT;1.1;AES256 @@ -138,7 +143,6 @@ skylab_services: adguard: user: autoguard - domain: adguard.en1.local networks: ext: 192.168.108.0/24 volumes: @@ -149,6 +153,9 @@ skylab_services: 8064: 8084 versions: server: v0.106.3 + publish: + domain: adguard.en1.local + http: 8064 settings: upstream: - 1.1.1.1 @@ -156,7 +163,6 @@ skylab_services: plex: user: autoplex - domain: pms.enp.one networks: ext: 192.168.101.0/24 volumes: @@ -172,6 +178,9 @@ skylab_services: 32414: 32414 versions: server: latest + publish: + domain: pms.enp.one + http: 32400 settings: mediastore: mediastore.skylab.enp.one internal_subnets: @@ -183,7 +192,6 @@ skylab_services: unifi: user: autounifi - domain: unifi.en1.local networks: ext: 192.168.100.0/24 volumes: @@ -198,10 +206,12 @@ skylab_services: 10001: 10001 versions: wlc: "6.2" + publish: + domain: unifi.en1.local + http: 8080 vikunja: user: autollama - domain: org.enp.one networks: ext: 192.168.107.0/24 volumes: @@ -216,6 +226,9 @@ skylab_services: proxy: latest api: 0.18.1 web: 0.18.1 + publish: + domain: org.enp.one + http: 8087 settings: database_password: !vault | $ANSIBLE_VAULT;1.1;AES256