diff options
| -rw-r--r-- | chaos-at-home/ch-testvm-prometheus.yml | 52 | ||||
| -rw-r--r-- | inventory/host_vars/ch-http-proxy.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/ch-testvm-prometheus.yml | 25 |
3 files changed, 2 insertions, 79 deletions
diff --git a/chaos-at-home/ch-testvm-prometheus.yml b/chaos-at-home/ch-testvm-prometheus.yml index c142100c..9a1191ad 100644 --- a/chaos-at-home/ch-testvm-prometheus.yml +++ b/chaos-at-home/ch-testvm-prometheus.yml @@ -7,55 +7,3 @@ - role: core/sshd/base - role: core/zsh - role: core/ntp - -- name: Payload Setup - hosts: ch-testvm-prometheus - roles: - - role: apt-repo/spreadspace - - role: nginx/base - - role: nginx/auth/whawty-sso/base - - role: nginx/auth/whawty-sso/auth - post_tasks: - #### test.chaos-at-home.org (default-server) - - name: create directory for default server - file: - path: /var/www/default - state: directory - - - name: copy chaos-at-home logo file - copy: - src: "{{ global_files_dir }}/chaos-at-home/logo.jpg" - dest: /var/www/default/logo.jpg - - - name: install index.html for default server - copy: - dest: /var/www/default/index.html - content: | - <html> - <head> - <title>No Such Site</title> - </head> - <body style="font-family: Helvetica, Arial, Sans-Serif; color: white; background: black;"> - <div style="text-align: center; margin-top: 4em; margin-left:auto; margin-right:auto;"> - <img src="logo.jpg" alt="chaos@home Logo" /> - <h2 style="">You have reached the chaos@home test webserver.</h2> - </div> - </body> - </html> - - - name: configure default vhost web.chaos-at-home.org - vars: - nginx_vhost: - default: yes - name: test - template: generic - hostnames: - - test.chaos-at-home.org - extra_directives: | - include snippets/whawty-sso-chaos-at-home.conf; - locations: - '/': - root: /var/www/default - index: index.html - include_role: - name: nginx/vhost diff --git a/inventory/host_vars/ch-http-proxy.yml b/inventory/host_vars/ch-http-proxy.yml index 07376b36..255dbebe 100644 --- a/inventory/host_vars/ch-http-proxy.yml +++ b/inventory/host_vars/ch-http-proxy.yml @@ -53,8 +53,8 @@ whawty_nginx_sso_logins: config: cookie: domain: ".chaos-at-home.org" - name: chaos-at-home-sso - secure: false + name: __Secure-chaos-at-home-sso + secure: yes expire: 23h keys: - name: 2023-11 diff --git a/inventory/host_vars/ch-testvm-prometheus.yml b/inventory/host_vars/ch-testvm-prometheus.yml index bec8d70d..415e6774 100644 --- a/inventory/host_vars/ch-testvm-prometheus.yml +++ b/inventory/host_vars/ch-testvm-prometheus.yml @@ -35,28 +35,3 @@ network: - *_network_primary_ ntp_variant: systemd-timesyncd - - - -whawty_nginx_sso_backends: - chaos-at-home: - port: 1234 - login_url: https://login.chaos-at-home.org/login - -whawty_nginx_sso_auths: - chaos-at-home: - config: - cookie: - domain: ".chaos-at-home.org" - name: chaos-at-home-sso - secure: no - expire: 23h - keys: - - name: 2023-11 - ed25519: - public-key: |- - -----BEGIN PUBLIC KEY----- - MCowBQYDK2VwAyEAawvVwThGnYYBDLjQ0Rs71prAmxQ/tfaPUNZvPWS3Z3U= - -----END PUBLIC KEY----- - web: - listen: 127.0.0.1:1234 |