mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-07-17 22:14:25 +02:00
Removed unecessary application_id s
This commit is contained in:
parent
25cee9a4c7
commit
aa61bf2a44
@ -1 +0,0 @@
|
|||||||
application_id: compose
|
|
@ -1,3 +1,2 @@
|
|||||||
systemd_telegram_folder: /opt/ansible-roles/alert-telegram/
|
systemd_telegram_folder: /opt/ansible-roles/alert-telegram/
|
||||||
systemd_telegram_script: '{{systemd_telegram_folder}}alert-telegram.sh'
|
systemd_telegram_script: '{{systemd_telegram_folder}}alert-telegram.sh'
|
||||||
application_id: telegram
|
|
||||||
|
@ -82,7 +82,7 @@ roles:
|
|||||||
title: "Alerting"
|
title: "Alerting"
|
||||||
description: "Notification handlers for system events"
|
description: "Notification handlers for system events"
|
||||||
icon: "fas fa-bell"
|
icon: "fas fa-bell"
|
||||||
invokable: true
|
invokable: false
|
||||||
maint:
|
maint:
|
||||||
title: "Maintenance & Healing"
|
title: "Maintenance & Healing"
|
||||||
description: "Periodic maintenance & auto-recovery"
|
description: "Periodic maintenance & auto-recovery"
|
||||||
|
@ -1 +0,0 @@
|
|||||||
application_id: dns-records
|
|
@ -13,7 +13,7 @@ server
|
|||||||
{{ proxy_extra_configuration }}
|
{{ proxy_extra_configuration }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %}
|
{% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
|
||||||
|
|
||||||
{% if applications | is_feature_enabled('oauth2', application_id) %}
|
{% if applications | is_feature_enabled('oauth2', application_id) %}
|
||||||
{% set acl = applications[application_id].oauth2_proxy.acl | default({}) %}
|
{% set acl = applications[application_id].oauth2_proxy.acl | default({}) %}
|
||||||
|
@ -6,7 +6,7 @@ map $http_upgrade $connection_upgrade {
|
|||||||
server {
|
server {
|
||||||
server_name {{ domain }};
|
server_name {{ domain }};
|
||||||
|
|
||||||
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %}
|
{% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
|
||||||
{% include 'roles/srv-web-7-7-inj-compose/templates/global.includes.conf.j2' %}
|
{% include 'roles/srv-web-7-7-inj-compose/templates/global.includes.conf.j2' %}
|
||||||
|
|
||||||
client_max_body_size {{ client_max_body_size | default('100m') }};
|
client_max_body_size {{ client_max_body_size | default('100m') }};
|
||||||
|
@ -17,7 +17,7 @@ When you apply **srv-web-7-6-https**, it will:
|
|||||||
|
|
||||||
1. **Include** the `srv-web-7-4-core` role to install and configure Nginx.
|
1. **Include** the `srv-web-7-4-core` role to install and configure Nginx.
|
||||||
2. **Clean up** any stale vHost files under `cln-domains`.
|
2. **Clean up** any stale vHost files under `cln-domains`.
|
||||||
3. **Deploy** the Let’s Encrypt challenge-and-redirect snippet from `net-letsencrypt`.
|
3. **Deploy** the Let’s Encrypt challenge-and-redirect snippet from `srv-web-7-7-letsencrypt`.
|
||||||
4. **Reload** Nginx automatically when any template changes.
|
4. **Reload** Nginx automatically when any template changes.
|
||||||
|
|
||||||
All tasks are idempotent—once your certificates are in place and your configuration is set, Ansible will skip unchanged steps on subsequent runs.
|
All tasks are idempotent—once your certificates are in place and your configuration is set, Ansible will skip unchanged steps on subsequent runs.
|
||||||
|
@ -26,4 +26,4 @@ galaxy_info:
|
|||||||
dependencies:
|
dependencies:
|
||||||
- srv-web-7-4-core
|
- srv-web-7-4-core
|
||||||
- cln-domains
|
- cln-domains
|
||||||
- net-letsencrypt
|
- srv-web-7-7-letsencrypt
|
@ -12,4 +12,4 @@ ssl_session_tickets on;
|
|||||||
add_header Strict-Transport-Security max-age=15768000;
|
add_header Strict-Transport-Security max-age=15768000;
|
||||||
ssl_stapling on;
|
ssl_stapling on;
|
||||||
ssl_stapling_verify on;
|
ssl_stapling_verify on;
|
||||||
{% include 'roles/net-letsencrypt/templates/ssl_credentials.j2' %}
|
{% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_credentials.j2' %}
|
@ -2,4 +2,3 @@ caa_entries:
|
|||||||
- tag: issue
|
- tag: issue
|
||||||
value: letsencrypt.org
|
value: letsencrypt.org
|
||||||
base_sld_domains: '{{ current_play_domains_all | generate_base_sld_domains }}'
|
base_sld_domains: '{{ current_play_domains_all | generate_base_sld_domains }}'
|
||||||
application_id: letsencrypt
|
|
@ -2,5 +2,5 @@ server {
|
|||||||
listen {{ports.public.ldaps.ldap}}ssl;
|
listen {{ports.public.ldaps.ldap}}ssl;
|
||||||
proxy_pass 127.0.0.1:{{ports.localhost.ldap.openldap}};
|
proxy_pass 127.0.0.1:{{ports.localhost.ldap.openldap}};
|
||||||
|
|
||||||
{% include 'roles/net-letsencrypt/templates/ssl_credentials.j2' %}
|
{% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_credentials.j2' %}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
server {
|
server {
|
||||||
server_name {{domain}};
|
server_name {{domain}};
|
||||||
|
|
||||||
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %}
|
{% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
|
||||||
|
|
||||||
{% include 'roles/srv-web-7-7-inj-compose/templates/global.includes.conf.j2'%}
|
{% include 'roles/srv-web-7-7-inj-compose/templates/global.includes.conf.j2'%}
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@
|
|||||||
|
|
||||||
- name: Include DNS role to register Gitea domain(s)
|
- name: Include DNS role to register Gitea domain(s)
|
||||||
include_role:
|
include_role:
|
||||||
name: net-dns-records
|
name: srv-web-7-7-dns-records
|
||||||
vars:
|
vars:
|
||||||
cloudflare_api_token: "{{ certbot_dns_api_token }}"
|
cloudflare_api_token: "{{ certbot_dns_api_token }}"
|
||||||
cloudflare_domains: "{{ [ domains | get_domain(application_id) ] }}"
|
cloudflare_domains: "{{ [ domains | get_domain(application_id) ] }}"
|
||||||
|
@ -5,7 +5,7 @@ server {
|
|||||||
{% set http_port = ports.localhost.http.synapse %}
|
{% set http_port = ports.localhost.http.synapse %}
|
||||||
|
|
||||||
server_name {{domains.matrix.synapse}};
|
server_name {{domains.matrix.synapse}};
|
||||||
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %}
|
{% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
|
||||||
|
|
||||||
# For the federation port
|
# For the federation port
|
||||||
listen 8448 ssl default_server;
|
listen 8448 ssl default_server;
|
||||||
|
@ -4,7 +4,7 @@ server
|
|||||||
{
|
{
|
||||||
server_name {{domain}};
|
server_name {{domain}};
|
||||||
|
|
||||||
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %}
|
{% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
|
||||||
|
|
||||||
{% include 'roles/srv-web-7-7-inj-compose/templates/global.includes.conf.j2'%}
|
{% include 'roles/srv-web-7-7-inj-compose/templates/global.includes.conf.j2'%}
|
||||||
# Remove X-Powered-By, which is an information leak
|
# Remove X-Powered-By, which is an information leak
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
server {
|
server {
|
||||||
server_name {{domain}};
|
server_name {{domain}};
|
||||||
|
|
||||||
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %}
|
{% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
|
||||||
|
|
||||||
{% include 'roles/srv-web-7-7-inj-compose/templates/global.includes.conf.j2'%}
|
{% include 'roles/srv-web-7-7-inj-compose/templates/global.includes.conf.j2'%}
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ server
|
|||||||
{{ proxy_extra_configuration }}
|
{{ proxy_extra_configuration }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %}
|
{% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
|
||||||
|
|
||||||
{% for path in syncope_paths.values() %}
|
{% for path in syncope_paths.values() %}
|
||||||
{% set location = web_protocol ~ '://' ~ domains | get_domain(application_id) ~ '/' ~ path ~ '/' %}
|
{% set location = web_protocol ~ '://' ~ domains | get_domain(application_id) ~ '/' ~ path ~ '/' %}
|
||||||
|
@ -2,7 +2,7 @@ server
|
|||||||
{
|
{
|
||||||
server_name {{domains | get_domain(application_id)}};
|
server_name {{domains | get_domain(application_id)}};
|
||||||
|
|
||||||
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %}
|
{% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
|
||||||
|
|
||||||
{% include 'roles/srv-web-7-7-inj-compose/templates/global.includes.conf.j2'%}
|
{% include 'roles/srv-web-7-7-inj-compose/templates/global.includes.conf.j2'%}
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ server
|
|||||||
{
|
{
|
||||||
server_name {{domains | get_domain(application_id)}};
|
server_name {{domains | get_domain(application_id)}};
|
||||||
|
|
||||||
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %}
|
{% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
|
||||||
|
|
||||||
{% include 'roles/srv-web-7-7-inj-compose/templates/global.includes.conf.j2'%}
|
{% include 'roles/srv-web-7-7-inj-compose/templates/global.includes.conf.j2'%}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
server {
|
server {
|
||||||
server_name {{ domain }};
|
server_name {{ domain }};
|
||||||
{% include 'roles/net-letsencrypt/templates/ssl_header.j2' %}
|
{% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
|
||||||
|
|
||||||
return 301 https://{{ target }}$request_uri;
|
return 301 https://{{ target }}$request_uri;
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
- name: Include DNS role to set redirects
|
- name: Include DNS role to set redirects
|
||||||
include_role:
|
include_role:
|
||||||
name: net-dns-records
|
name: srv-web-7-7-dns-records
|
||||||
vars:
|
vars:
|
||||||
cloudflare_api_token: "{{ certbot_dns_api_token }}"
|
cloudflare_api_token: "{{ certbot_dns_api_token }}"
|
||||||
cloudflare_domains: "{{ www_domains }}"
|
cloudflare_domains: "{{ www_domains }}"
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
- name: "setup docker role includes for desktop pc"
|
- name: "setup docker role includes for desktop pc"
|
||||||
include_tasks: "./tasks/groups/{{ item }}-roles.yml"
|
include_tasks: "./tasks/groups/{{ item }}-roles.yml"
|
||||||
loop:
|
loop:
|
||||||
- util-srv # Services need to run before applications
|
- desk
|
||||||
- util-desk
|
- util-desk
|
||||||
loop_control:
|
loop_control:
|
||||||
label: "{{ item }}-roles.yml"
|
label: "{{ item }}-roles.yml"
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
- name: "Include server roles"
|
- name: "Include server roles"
|
||||||
include_tasks: "./tasks/groups/{{ item }}-roles.yml"
|
include_tasks: "./tasks/groups/{{ item }}-roles.yml"
|
||||||
loop:
|
loop:
|
||||||
|
- util-srv
|
||||||
- web-svc # Services need to run before applications
|
- web-svc # Services need to run before applications
|
||||||
- web-app
|
- web-app
|
||||||
loop_control:
|
loop_control:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user