Small fixes
* fix ACME setup * use correct port number * use correct email sender
This commit is contained in:
parent
f238182302
commit
e630ffdf46
|
@ -8,6 +8,7 @@ all:
|
||||||
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
|
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
|
||||||
hackertours:
|
hackertours:
|
||||||
ansible_host: hackertours-intern.hamburg.ccc.de
|
ansible_host: hackertours-intern.hamburg.ccc.de
|
||||||
|
ansible_port: 42666
|
||||||
ansible_user: chaos
|
ansible_user: chaos
|
||||||
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
|
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
|
||||||
keycloak:
|
keycloak:
|
||||||
|
|
|
@ -37,6 +37,6 @@ server {
|
||||||
proxy_set_header Forwarded "for=$remote_addr;proto=https;host=$host;by=_hidden";
|
proxy_set_header Forwarded "for=$remote_addr;proto=https;host=$host;by=_hidden";
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://127.0.0.1:80/;
|
proxy_pass http://127.0.0.1:8345/;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -6,6 +6,7 @@ map $host $upstream_acme_challenge_host {
|
||||||
aes.ccchh.net 172.31.17.145:31820;
|
aes.ccchh.net 172.31.17.145:31820;
|
||||||
wiki.ccchh.net 172.31.17.146:31820;
|
wiki.ccchh.net 172.31.17.146:31820;
|
||||||
onlyoffice.hamburg.ccc.de 172.31.17.147:31820;
|
onlyoffice.hamburg.ccc.de 172.31.17.147:31820;
|
||||||
|
hackertours.hamburg.ccc.de 172.31.17.148:31820;
|
||||||
netbox.hamburg.ccc.de 172.31.17.149:31820;
|
netbox.hamburg.ccc.de 172.31.17.149:31820;
|
||||||
matrix.hamburg.ccc.de 172.31.17.150:31820;
|
matrix.hamburg.ccc.de 172.31.17.150:31820;
|
||||||
element.hamburg.ccc.de 172.31.17.151:31820;
|
element.hamburg.ccc.de 172.31.17.151:31820;
|
||||||
|
|
|
@ -25,6 +25,7 @@ stream {
|
||||||
aes.ccchh.net 172.31.17.145:8443;
|
aes.ccchh.net 172.31.17.145:8443;
|
||||||
wiki.ccchh.net 172.31.17.146:8443;
|
wiki.ccchh.net 172.31.17.146:8443;
|
||||||
onlyoffice.hamburg.ccc.de 172.31.17.147:8443;
|
onlyoffice.hamburg.ccc.de 172.31.17.147:8443;
|
||||||
|
hackertours.hamburg.ccc.de 172.31.17.148:8443;
|
||||||
netbox.hamburg.ccc.de 172.31.17.149:8443;
|
netbox.hamburg.ccc.de 172.31.17.149:8443;
|
||||||
matrix.hamburg.ccc.de 172.31.17.150:8443;
|
matrix.hamburg.ccc.de 172.31.17.150:8443;
|
||||||
element.hamburg.ccc.de 172.31.17.151:8443;
|
element.hamburg.ccc.de 172.31.17.151:8443;
|
||||||
|
|
|
@ -23,9 +23,14 @@ services:
|
||||||
# run redis-server, save a snapshot every 60 seconds if there has been at least 1 write
|
# run redis-server, save a snapshot every 60 seconds if there has been at least 1 write
|
||||||
command: ["redis-server", "--save", "60", "1"]
|
command: ["redis-server", "--save", "60", "1"]
|
||||||
restart: always
|
restart: always
|
||||||
|
networks:
|
||||||
|
backend:
|
||||||
|
|
||||||
pretix:
|
pretix:
|
||||||
image: gitlab-cr.hamburg.ccc.de/ccchh/ccchh-pretix/ccchh-pretix:23.10.0
|
image: gitlab-cr.hamburg.ccc.de/ccchh/ccchh-pretix/ccchh-pretix:23.10.0
|
||||||
|
command: ["all"]
|
||||||
|
ports:
|
||||||
|
- "8345:80"
|
||||||
environment:
|
environment:
|
||||||
- "PRETIX_INSTANCE_NAME=CCCHH Hackertours"
|
- "PRETIX_INSTANCE_NAME=CCCHH Hackertours"
|
||||||
- "PRETIX_URL=http://hackertours.hamburg.ccc.de"
|
- "PRETIX_URL=http://hackertours.hamburg.ccc.de"
|
||||||
|
@ -34,7 +39,7 @@ services:
|
||||||
- "DATABASE_USER=pretix"
|
- "DATABASE_USER=pretix"
|
||||||
- "DATABASE_PASSWORD={{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/hackertours/DB_PASSWORD", create=false, missing="error") }}"
|
- "DATABASE_PASSWORD={{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/hackertours/DB_PASSWORD", create=false, missing="error") }}"
|
||||||
- "DATABASE_HOST=database"
|
- "DATABASE_HOST=database"
|
||||||
- "MAIL_FROM=foo@example.com"
|
- "MAIL_FROM=ticket@hackertours.hamburg.ccc.de"
|
||||||
- "MAIL_HOST=cow-intern.hamburg.ccc.de"
|
- "MAIL_HOST=cow-intern.hamburg.ccc.de"
|
||||||
- "REDIS_LOCATION=redis://redis/0"
|
- "REDIS_LOCATION=redis://redis/0"
|
||||||
- "CELERY_BACKEND=redis://redis/0"
|
- "CELERY_BACKEND=redis://redis/0"
|
||||||
|
@ -42,6 +47,9 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- pretix:/rdata
|
- pretix:/rdata
|
||||||
restart: always
|
restart: always
|
||||||
|
networks:
|
||||||
|
backend:
|
||||||
|
frontend:
|
||||||
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
|
|
Loading…
Reference in a new issue