diff --git a/host_vars/jitsi.yaml b/host_vars/jitsi.yaml new file mode 100644 index 0000000..9e7d222 --- /dev/null +++ b/host_vars/jitsi.yaml @@ -0,0 +1,8 @@ +--- +ansible_host: jitsi.intra.tormakris.dev +webserver: + - domain: "jitsi.tormakristof.eu" + port: 8080 + bigrequests: false + https: true +... diff --git a/host_vars/librespeed.yaml b/host_vars/librespeed.yaml new file mode 100644 index 0000000..32e9a7d --- /dev/null +++ b/host_vars/librespeed.yaml @@ -0,0 +1,8 @@ +--- +ansible_host: librespeed.intra.tormakris.dev +webserver: + - domain: "speedtest.tormakristof.eu" + port: 8080 + bigrequests: true + https: false +... diff --git a/host_vars/sonar.yaml b/host_vars/sonar.yaml deleted file mode 100644 index 3f8506b..0000000 --- a/host_vars/sonar.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -ansible_host: sonar.intra.tormakris.dev -... diff --git a/host_vars/swagger.yaml b/host_vars/swagger.yaml deleted file mode 100644 index 3376cc0..0000000 --- a/host_vars/swagger.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -ansible_host: swagger.intra.tormakris.dev -... diff --git a/inventory.yaml b/inventory.yaml index 816485c..78a100e 100644 --- a/inventory.yaml +++ b/inventory.yaml @@ -22,6 +22,8 @@ all: bitwarden: nextcloud: backup: + jitsi: + librespeed: dockerwebhosts: hosts: matrix: @@ -33,6 +35,8 @@ all: monitoring: ytmirror: mastodon: + librespeed: + jitsi: nightlydocker: hosts: matrix: @@ -43,4 +47,6 @@ all: monitoring: ytmirror: mastodon: + librespeed: + jitsi: ... diff --git a/roles/common/defaults/main.yaml b/roles/common/defaults/main.yaml index 884c933..4ec5b2d 100644 --- a/roles/common/defaults/main.yaml +++ b/roles/common/defaults/main.yaml @@ -1,6 +1,6 @@ --- # defaults file for timedatectl -timedatectl_timeservers: ['noc-a.sch.bme.hu', 'noc-b.sch.bme.hu'] +timedatectl_timeservers: ['time.intra.tormakris.dev'] timedatectl_timeservers_fallback: ['time.bme.hu'] diff --git a/roles/webgateway/tasks/main.yaml b/roles/webgateway/tasks/main.yaml index 3736849..5309b33 100644 --- a/roles/webgateway/tasks/main.yaml +++ b/roles/webgateway/tasks/main.yaml @@ -50,7 +50,7 @@ - name: "Generate certbot script" ansible.builtin.template: src: certbot.sh - dest: /etc/cron.weekly/certbot.sh + dest: /etc/cron.weekly/certbot owner: root group: root mode: '0700' diff --git a/roles/webgateway/vars/main.yaml b/roles/webgateway/vars/main.yaml index b8ead98..9a35905 100644 --- a/roles/webgateway/vars/main.yaml +++ b/roles/webgateway/vars/main.yaml @@ -8,14 +8,14 @@ proxy: - {domain: chat.tormakristof.eu, ip: matrix.intra.tormakris.dev, bigrequests: true} - {domain: nexus.kmlabz.com, ip: nexus.intra.tormakris.dev, bigrequests: true} - {domain: registry.kmlabz.com, ip: nexus.intra.tormakris.dev, bigrequests: true} - - {domain: swagger.kmlabz.com, ip: swagger.intra.tormakris.dev, bigrequests: false} - {domain: fs.tormakristof.eu, ip: adfs.intra.tormakris.dev, bigrequests: false} - {domain: certauth.fs.tormakristof.eu, ip: adfs.intra.tormakris.dev, bigrequests: false} - {domain: grafana.tormakristof.eu, ip: monitoring.intra.tormakris.dev, bigrequests: false} - - {domain: sharepoint.tormakristof.eu, ip: sharepoint.intra.tormakris.dev, bigrequests: true} - - {domain: onedrive.tormakristof.eu, ip: sharepoint.intra.tormakris.dev, bigrequests: true} - {domain: yt.tormakristof.eu, ip: ytmirror.intra.tormakris.dev, bigrequests: true} - {domain: mastodon.tormakristof.eu, ip: mastodon.intra.tormakris.dev, bigrequests: true} + - {domain: jitsi.tormakristof.eu, ip: jitsi.intra.tormakris.dev, bigrequests: false} + - {domain: speedtest.tormakristof.eu, ip: librespeed.intra.tormakris.dev, bigrequests: true} + static: []