diff --git a/.gitmodules b/.gitmodules index 7e8d0b9..cdb505e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -141,3 +141,6 @@ [submodule "collections/ansible_collections/l3d/time"] path = collections/ansible_collections/l3d/time url = https://github.com/roles-ansible/ansible_collection_time.git +[submodule "roles/l3d.homebox"] + path = roles/l3d.homebox + url = https://github.com/roles-ansible/ansible_role_homebox.git diff --git a/collections/ansible_collections/ansible/posix b/collections/ansible_collections/ansible/posix index 0847977..e929aad 160000 --- a/collections/ansible_collections/ansible/posix +++ b/collections/ansible_collections/ansible/posix @@ -1 +1 @@ -Subproject commit 0847977d1216cbe2b09a22900210343812591d6c +Subproject commit e929aad539c46b8fa01bfcb393504ff306b3bce5 diff --git a/collections/ansible_collections/l3d/git b/collections/ansible_collections/l3d/git index 2d3f508..6862285 160000 --- a/collections/ansible_collections/l3d/git +++ b/collections/ansible_collections/l3d/git @@ -1 +1 @@ -Subproject commit 2d3f508d490d8576cff68dc32c64450b8c7894d3 +Subproject commit 6862285e732e094c49a8851fd8e8229a96fd3243 diff --git a/collections/ansible_collections/prometheus/prometheus b/collections/ansible_collections/prometheus/prometheus index 11802e4..d0f3c78 160000 --- a/collections/ansible_collections/prometheus/prometheus +++ b/collections/ansible_collections/prometheus/prometheus @@ -1 +1 @@ -Subproject commit 11802e4e9a8f785d3f6ad23cd5af24d62ed6f5a4 +Subproject commit d0f3c784f8e608bd6a8af9b5465d326f23c5e892 diff --git a/host_vars/services.l3d.space/vars.yml b/host_vars/services.l3d.space/vars.yml index cbe0a3e..5c5aa11 100644 --- a/host_vars/services.l3d.space/vars.yml +++ b/host_vars/services.l3d.space/vars.yml @@ -6,6 +6,8 @@ nginx_sites: - name: 'etebase.l3d.ch' - name: 'grafana.l3d.ch' - name: 'www.grafana.l3d.ch' + - name: 'i.l3d.ch' + - name: 'www.i.l3d.ch' - name: 'node-exporter.services.l3d.space' - name: 'nginx-exporter.services.l3d.space' @@ -44,6 +46,10 @@ grafana_dashboards: revision_id: '1' datasource: '{{ grafana_datasources.0.name }}' +# l3d.homebox +homebox__env_options_allow_registration: false +homebox__env_web_host: '127.0.0.1' + # l3d.nginx_exporter nginx_exporter_listen_address: '127.0.0.1:9113' nginx_exporter_scrape_uri: 'https://node-exporter.services.l3d.space/nginx_status' diff --git a/roles/l3d.homebox b/roles/l3d.homebox new file mode 160000 index 0000000..6665752 --- /dev/null +++ b/roles/l3d.homebox @@ -0,0 +1 @@ +Subproject commit 66657529f3a19c9c43203e12371c5f90192f6de8 diff --git a/site.yml b/site.yml index cf050e1..bcd610a 100644 --- a/site.yml +++ b/site.yml @@ -50,6 +50,7 @@ - {role: do1jlr.etebase, tags: [etebase, etesync, calendar, kalender, contacts, kontakte]} - {role: grafana.grafana.grafana, tags: [grafana. monitoring]} - {role: prometheus.prometheus.prometheus, tags: [monitoring, prometheus]} + - {role: l3d.homebox, tags: [homebox]} - name: Deploy mail config hosts: mail diff --git a/templates/files/nginx/sites/i.l3d.ch_tls.conf b/templates/files/nginx/sites/i.l3d.ch_tls.conf new file mode 100644 index 0000000..61e691c --- /dev/null +++ b/templates/files/nginx/sites/i.l3d.ch_tls.conf @@ -0,0 +1,20 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name i.l3d.ch; + + include snippets/tls_parameters_{{ site.name }}.snippet.conf; + include snippets/tls_certificate_{{ site.name }}.snippet.conf; + include snippets/logging_{{ site.name }}.snippet.conf; + + location / { + proxy_pass http://localhost:7745; + client_max_body_size 10M; + proxy_read_timeout 1600; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } +} diff --git a/templates/files/nginx/sites/www.i.l3d.ch_tls.conf b/templates/files/nginx/sites/www.i.l3d.ch_tls.conf new file mode 100644 index 0000000..f0d4d34 --- /dev/null +++ b/templates/files/nginx/sites/www.i.l3d.ch_tls.conf @@ -0,0 +1,14 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name www.i.l3d.ch; + + include snippets/tls_parameters_{{ site.name }}.snippet.conf; + include snippets/tls_certificate_{{ site.name }}.snippet.conf; + include snippets/logging_{{ site.name }}.snippet.conf; + + location / { + return 308 https://i.l3d.ch/; + } +}