Compare commits
1 commit
main
...
renovate/a
| Author | SHA1 | Date | |
|---|---|---|---|
| 64168bc393 |
9 changed files with 30 additions and 14 deletions
|
|
@ -4,7 +4,7 @@ all:
|
||||||
ansible_host: authoritative-dns.z9.ccchh.net
|
ansible_host: authoritative-dns.z9.ccchh.net
|
||||||
ansible_user: chaos
|
ansible_user: chaos
|
||||||
dooris:
|
dooris:
|
||||||
ansible_host: dooris.z9.ccchh.net
|
ansible_host: 10.31.208.201
|
||||||
ansible_user: chaos
|
ansible_user: chaos
|
||||||
light:
|
light:
|
||||||
ansible_host: light.z9.ccchh.net
|
ansible_host: light.z9.ccchh.net
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: docker.io/library/wordpress:6-php8.1@sha256:75f79f9c45a587b283e47fd21c6e51077d0c9dbbba529377faaa0c28d5b8f5a4
|
image: docker.io/library/wordpress:6-php8.1@sha256:af4fda0f8a9eac9e3aa1c85a821c8b0f54124cad19456389bf53dc96a382449c
|
||||||
environment:
|
environment:
|
||||||
- "WORDPRESS_DB_HOST=database"
|
- "WORDPRESS_DB_HOST=database"
|
||||||
- "WORDPRESS_DB_NAME=wordpress"
|
- "WORDPRESS_DB_NAME=wordpress"
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ services:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: docker.io/library/postgres:15.14@sha256:424e79b81868f5fc5cf515eaeac69d288692ebcca7db86d98f91b50d4bce64bb
|
image: docker.io/library/postgres:15.14@sha256:822f8795764a670160640888508b2a68ea5c4b045012c2de17e1d0447bdbdc99
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- keycloak
|
- keycloak
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ services:
|
||||||
- pretalx_net
|
- pretalx_net
|
||||||
|
|
||||||
static:
|
static:
|
||||||
image: docker.io/library/nginx:1.29.3@sha256:f547e3d0d5d02f7009737b284abc87d808e4252b42dceea361811e9fc606287f
|
image: docker.io/library/nginx:1.29.3@sha256:1beed3ca46acebe9d3fb62e9067f03d05d5bfa97a00f30938a0a3580563272ad
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- public:/usr/share/nginx/html
|
- public:/usr/share/nginx/html
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,11 @@ server {
|
||||||
|
|
||||||
location = / {
|
location = / {
|
||||||
#return 302 https://wiki.hamburg.ccc.de/infrastructure:service-overview#tickets_pretix;
|
#return 302 https://wiki.hamburg.ccc.de/infrastructure:service-overview#tickets_pretix;
|
||||||
return 302 https://tickets.hamburg.ccc.de/hackertours/39c3ht/;
|
return 302 https://tickets.hamburg.ccc.de/hackertours/eh22ht/;
|
||||||
|
}
|
||||||
|
|
||||||
|
location = /hackertours/eh22/ {
|
||||||
|
return 302 https://tickets.hamburg.ccc.de/hackertours/eh22ht/;
|
||||||
}
|
}
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
|
|
|
||||||
|
|
@ -17,15 +17,7 @@ HostKey /etc/ssh/ssh_host_ed25519_key
|
||||||
HostKey /etc/ssh/ssh_host_rsa_key
|
HostKey /etc/ssh/ssh_host_rsa_key
|
||||||
HostKey /etc/ssh/ssh_host_ecdsa_key
|
HostKey /etc/ssh/ssh_host_ecdsa_key
|
||||||
|
|
||||||
|
|
||||||
{% if ansible_facts["distribution"] == "Debian" and ansible_facts["distribution_major_version"] == "13" %}
|
|
||||||
KexAlgorithms mlkem768x25519-sha256,curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256
|
|
||||||
{% elif ansible_facts["distribution"] == "Debian" and ansible_facts["distribution_major_version"] == "12" %}
|
|
||||||
KexAlgorithms sntrup761x25519-sha512,curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256
|
|
||||||
{% else %}
|
|
||||||
KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256
|
KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
|
|
||||||
Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
|
Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
|
||||||
|
|
||||||
|
|
|
||||||
8
roles/foobazdmx/meta/main.yaml
Normal file
8
roles/foobazdmx/meta/main.yaml
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
---
|
||||||
|
dependencies:
|
||||||
|
- role: distribution_check
|
||||||
|
vars:
|
||||||
|
distribution_check__distribution_support_spec:
|
||||||
|
- name: Debian
|
||||||
|
major_versions:
|
||||||
|
- "11"
|
||||||
|
|
@ -7,7 +7,11 @@
|
||||||
- python3
|
- python3
|
||||||
- python3-pip
|
- python3-pip
|
||||||
- python3-setuptools
|
- python3-setuptools
|
||||||
- python3-poetry
|
|
||||||
|
- name: Ensure python peotry is installed
|
||||||
|
become: true
|
||||||
|
ansible.builtin.pip:
|
||||||
|
name: poetry
|
||||||
|
|
||||||
- name: Ensure foobazdmx user exists
|
- name: Ensure foobazdmx user exists
|
||||||
become: true
|
become: true
|
||||||
|
|
|
||||||
8
roles/ola/meta/main.yaml
Normal file
8
roles/ola/meta/main.yaml
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
---
|
||||||
|
dependencies:
|
||||||
|
- role: distribution_check
|
||||||
|
vars:
|
||||||
|
distribution_check__distribution_support_spec:
|
||||||
|
- name: Debian
|
||||||
|
major_versions:
|
||||||
|
- "11"
|
||||||
Loading…
Add table
Add a link
Reference in a new issue