Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ae314ea9b3 | |||
| a2eba1ac70 | |||
| 5ae8a3b186 | |||
| 6389a936c8 | |||
| 233131b612 | |||
|
a87c27b3d5 |
10 changed files with 165 additions and 270 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1,4 +1,4 @@
|
||||||
.ansible/
|
.ansible/
|
||||||
**/__pycache__
|
**/__pycache__
|
||||||
**/.DS_store
|
**/.DS_store
|
||||||
ssh.cfg.local
|
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,3 @@ vars_plugins_enabled = host_group_vars,community.sops.sops
|
||||||
collections_path = ./
|
collections_path = ./
|
||||||
roles_path = ./galaxy-roles
|
roles_path = ./galaxy-roles
|
||||||
interpreter_python = python3
|
interpreter_python = python3
|
||||||
|
|
||||||
[ssh_connection]
|
|
||||||
ssh_args = -F ssh.cfg -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=known_hosts
|
|
||||||
|
|
|
||||||
|
|
@ -1,65 +1,141 @@
|
||||||
all:
|
all:
|
||||||
hosts:
|
hosts:
|
||||||
acmedns:
|
|
||||||
auth-dns:
|
|
||||||
ccchoir:
|
ccchoir:
|
||||||
|
ansible_host: ccchoir.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
chaosknoten:
|
chaosknoten:
|
||||||
|
ansible_host: chaosknoten.hamburg.ccc.de
|
||||||
cloud:
|
cloud:
|
||||||
|
ansible_host: cloud.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
diday-staging-runner:
|
diday-staging-runner:
|
||||||
|
ansible_host: diday-staging-runner.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
eh22-wiki:
|
eh22-wiki:
|
||||||
forgejo-runner:
|
ansible_host: eh22-wiki.hosts.hamburg.ccc.de
|
||||||
forgejo-runner-external:
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
grafana:
|
grafana:
|
||||||
jitsi:
|
ansible_host: grafana.hosts.hamburg.ccc.de
|
||||||
keycloak:
|
ansible_user: chaos
|
||||||
lists:
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
mjolnir:
|
|
||||||
mumble:
|
|
||||||
netbox:
|
|
||||||
ntfy:
|
|
||||||
onlyoffice:
|
|
||||||
pad:
|
|
||||||
pretalx:
|
|
||||||
public-reverse-proxy:
|
|
||||||
renovate:
|
|
||||||
router:
|
|
||||||
spaceapiccc:
|
|
||||||
sunders:
|
|
||||||
tickets:
|
tickets:
|
||||||
|
ansible_host: tickets.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
jitsi:
|
||||||
|
ansible_host: jitsi.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
keycloak:
|
||||||
|
ansible_host: keycloak.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
lists:
|
||||||
|
ansible_host: lists.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
mjolnir:
|
||||||
|
ansible_host: mjolnir.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
mumble:
|
||||||
|
ansible_host: mumble.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
netbox:
|
||||||
|
ansible_host: netbox.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
onlyoffice:
|
||||||
|
ansible_host: onlyoffice.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
pad:
|
||||||
|
ansible_host: pad.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
pretalx:
|
||||||
|
ansible_host: pretalx.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
public-reverse-proxy:
|
||||||
|
ansible_host: public-reverse-proxy.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
router:
|
||||||
|
ansible_host: router.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
wiki:
|
wiki:
|
||||||
|
ansible_host: wiki.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
zammad:
|
zammad:
|
||||||
|
ansible_host: zammad.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
ntfy:
|
||||||
|
ansible_host: ntfy.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
sunders:
|
||||||
|
ansible_host: sunders.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
renovate:
|
||||||
|
ansible_host: renovate.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
spaceapiccc:
|
||||||
|
ansible_host: spaceapiccc.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
acmedns:
|
||||||
|
ansible_host: acmedns.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
auth-dns:
|
||||||
|
ansible_host: auth-dns.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
forgejo-runner:
|
||||||
|
ansible_host: forgejo-runner.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
|
forgejo-runner-external:
|
||||||
|
ansible_host: forgejo-runner-external.hosts.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
|
ansible_ssh_common_args: -J ssh://chaos@router.hamburg.ccc.de
|
||||||
hypervisors:
|
hypervisors:
|
||||||
hosts:
|
hosts:
|
||||||
chaosknoten:
|
chaosknoten:
|
||||||
base_config_hosts:
|
base_config_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
acmedns:
|
acmedns:
|
||||||
auth-dns:
|
|
||||||
ccchoir:
|
ccchoir:
|
||||||
cloud:
|
cloud:
|
||||||
diday-staging-runner:
|
diday-staging-runner:
|
||||||
eh22-wiki:
|
eh22-wiki:
|
||||||
forgejo-runner:
|
|
||||||
forgejo-runner-external:
|
|
||||||
grafana:
|
grafana:
|
||||||
jitsi:
|
jitsi:
|
||||||
keycloak:
|
keycloak:
|
||||||
lists:
|
lists:
|
||||||
mjolnir:
|
|
||||||
mumble:
|
mumble:
|
||||||
netbox:
|
netbox:
|
||||||
ntfy:
|
|
||||||
onlyoffice:
|
onlyoffice:
|
||||||
pad:
|
pad:
|
||||||
pretalx:
|
pretalx:
|
||||||
public-reverse-proxy:
|
public-reverse-proxy:
|
||||||
renovate:
|
|
||||||
router:
|
router:
|
||||||
spaceapiccc:
|
|
||||||
sunders:
|
|
||||||
tickets:
|
tickets:
|
||||||
wiki:
|
wiki:
|
||||||
zammad:
|
zammad:
|
||||||
|
ntfy:
|
||||||
|
sunders:
|
||||||
|
renovate:
|
||||||
|
spaceapiccc:
|
||||||
|
mjolnir:
|
||||||
|
auth-dns:
|
||||||
|
forgejo-runner:
|
||||||
|
forgejo-runner-external:
|
||||||
systemd_networkd_hosts:
|
systemd_networkd_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
router:
|
router:
|
||||||
|
|
@ -72,17 +148,17 @@ docker_compose_hosts:
|
||||||
ccchoir:
|
ccchoir:
|
||||||
diday-staging-runner:
|
diday-staging-runner:
|
||||||
grafana:
|
grafana:
|
||||||
|
tickets:
|
||||||
keycloak:
|
keycloak:
|
||||||
lists:
|
lists:
|
||||||
mjolnir:
|
|
||||||
ntfy:
|
|
||||||
onlyoffice:
|
onlyoffice:
|
||||||
pad:
|
pad:
|
||||||
pretalx:
|
pretalx:
|
||||||
spaceapiccc:
|
|
||||||
sunders:
|
|
||||||
tickets:
|
|
||||||
zammad:
|
zammad:
|
||||||
|
ntfy:
|
||||||
|
sunders:
|
||||||
|
spaceapiccc:
|
||||||
|
mjolnir:
|
||||||
nextcloud_hosts:
|
nextcloud_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
cloud:
|
cloud:
|
||||||
|
|
@ -92,20 +168,20 @@ nginx_hosts:
|
||||||
ccchoir:
|
ccchoir:
|
||||||
eh22-wiki:
|
eh22-wiki:
|
||||||
grafana:
|
grafana:
|
||||||
|
tickets:
|
||||||
keycloak:
|
keycloak:
|
||||||
lists:
|
lists:
|
||||||
mumble:
|
mumble:
|
||||||
netbox:
|
netbox:
|
||||||
ntfy:
|
|
||||||
onlyoffice:
|
onlyoffice:
|
||||||
pad:
|
pad:
|
||||||
pretalx:
|
pretalx:
|
||||||
public-reverse-proxy:
|
public-reverse-proxy:
|
||||||
spaceapiccc:
|
|
||||||
sunders:
|
|
||||||
tickets:
|
|
||||||
wiki:
|
wiki:
|
||||||
zammad:
|
zammad:
|
||||||
|
ntfy:
|
||||||
|
sunders:
|
||||||
|
spaceapiccc:
|
||||||
public_reverse_proxy_hosts:
|
public_reverse_proxy_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
public-reverse-proxy:
|
public-reverse-proxy:
|
||||||
|
|
@ -115,66 +191,66 @@ certbot_hosts:
|
||||||
ccchoir:
|
ccchoir:
|
||||||
eh22-wiki:
|
eh22-wiki:
|
||||||
grafana:
|
grafana:
|
||||||
|
tickets:
|
||||||
keycloak:
|
keycloak:
|
||||||
lists:
|
lists:
|
||||||
mumble:
|
mumble:
|
||||||
netbox:
|
netbox:
|
||||||
ntfy:
|
|
||||||
onlyoffice:
|
onlyoffice:
|
||||||
pad:
|
pad:
|
||||||
pretalx:
|
pretalx:
|
||||||
spaceapiccc:
|
|
||||||
sunders:
|
|
||||||
tickets:
|
|
||||||
wiki:
|
wiki:
|
||||||
zammad:
|
zammad:
|
||||||
|
ntfy:
|
||||||
|
sunders:
|
||||||
|
spaceapiccc:
|
||||||
alloy_hosts:
|
alloy_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
auth-dns:
|
|
||||||
ccchoir:
|
ccchoir:
|
||||||
cloud:
|
|
||||||
eh22-wiki:
|
eh22-wiki:
|
||||||
grafana:
|
|
||||||
keycloak:
|
keycloak:
|
||||||
netbox:
|
netbox:
|
||||||
ntfy:
|
|
||||||
onlyoffice:
|
onlyoffice:
|
||||||
pad:
|
pad:
|
||||||
pretalx:
|
pretalx:
|
||||||
public-reverse-proxy:
|
|
||||||
renovate:
|
|
||||||
router:
|
|
||||||
spaceapiccc:
|
|
||||||
sunders:
|
|
||||||
tickets:
|
|
||||||
wiki:
|
wiki:
|
||||||
zammad:
|
zammad:
|
||||||
|
grafana:
|
||||||
|
ntfy:
|
||||||
|
tickets:
|
||||||
|
renovate:
|
||||||
|
cloud:
|
||||||
|
public-reverse-proxy:
|
||||||
|
router:
|
||||||
|
sunders:
|
||||||
|
spaceapiccc:
|
||||||
|
auth-dns:
|
||||||
infrastructure_authorized_keys_hosts:
|
infrastructure_authorized_keys_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
auth-dns:
|
|
||||||
ccchoir:
|
ccchoir:
|
||||||
cloud:
|
|
||||||
eh22-wiki:
|
eh22-wiki:
|
||||||
forgejo-runner:
|
|
||||||
forgejo-runner-external:
|
|
||||||
grafana:
|
grafana:
|
||||||
|
tickets:
|
||||||
|
cloud:
|
||||||
jitsi:
|
jitsi:
|
||||||
keycloak:
|
keycloak:
|
||||||
lists:
|
|
||||||
mjolnir:
|
|
||||||
netbox:
|
netbox:
|
||||||
ntfy:
|
|
||||||
onlyoffice:
|
onlyoffice:
|
||||||
pad:
|
pad:
|
||||||
pretalx:
|
pretalx:
|
||||||
public-reverse-proxy:
|
public-reverse-proxy:
|
||||||
renovate:
|
|
||||||
router:
|
router:
|
||||||
spaceapiccc:
|
|
||||||
sunders:
|
|
||||||
tickets:
|
|
||||||
wiki:
|
wiki:
|
||||||
zammad:
|
zammad:
|
||||||
|
ntfy:
|
||||||
|
sunders:
|
||||||
|
renovate:
|
||||||
|
spaceapiccc:
|
||||||
|
mjolnir:
|
||||||
|
auth-dns:
|
||||||
|
lists:
|
||||||
|
forgejo-runner:
|
||||||
|
forgejo-runner-external:
|
||||||
wiki_hosts:
|
wiki_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
eh22-wiki:
|
eh22-wiki:
|
||||||
|
|
@ -187,31 +263,31 @@ proxmox_vm_template_hosts:
|
||||||
chaosknoten:
|
chaosknoten:
|
||||||
ansible_pull_hosts:
|
ansible_pull_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
auth-dns:
|
netbox:
|
||||||
ccchoir:
|
|
||||||
cloud:
|
cloud:
|
||||||
diday-staging-runner:
|
diday-staging-runner:
|
||||||
eh22-wiki:
|
eh22-wiki:
|
||||||
forgejo-runner:
|
|
||||||
forgejo-runner-external:
|
|
||||||
grafana:
|
grafana:
|
||||||
|
onlyoffice:
|
||||||
|
pretalx:
|
||||||
|
sunders:
|
||||||
|
renovate:
|
||||||
|
wiki:
|
||||||
|
ccchoir:
|
||||||
|
tickets:
|
||||||
jitsi:
|
jitsi:
|
||||||
keycloak:
|
keycloak:
|
||||||
lists:
|
lists:
|
||||||
mjolnir:
|
|
||||||
mumble:
|
mumble:
|
||||||
netbox:
|
|
||||||
ntfy:
|
|
||||||
onlyoffice:
|
|
||||||
pad:
|
pad:
|
||||||
pretalx:
|
|
||||||
public-reverse-proxy:
|
public-reverse-proxy:
|
||||||
renovate:
|
|
||||||
spaceapiccc:
|
|
||||||
sunders:
|
|
||||||
tickets:
|
|
||||||
wiki:
|
|
||||||
zammad:
|
zammad:
|
||||||
|
ntfy:
|
||||||
|
spaceapiccc:
|
||||||
|
mjolnir:
|
||||||
|
auth-dns:
|
||||||
|
forgejo-runner:
|
||||||
|
forgejo-runner-external:
|
||||||
msmtp_hosts:
|
msmtp_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
renovate_hosts:
|
renovate_hosts:
|
||||||
|
|
|
||||||
2
inventories/external/hosts.yaml
vendored
2
inventories/external/hosts.yaml
vendored
|
|
@ -2,6 +2,8 @@ all:
|
||||||
hosts:
|
hosts:
|
||||||
status:
|
status:
|
||||||
# TODO: Manually set up ufw on the host. Create a role for ufw.
|
# TODO: Manually set up ufw on the host. Create a role for ufw.
|
||||||
|
ansible_host: status.hamburg.ccc.de
|
||||||
|
ansible_user: chaos
|
||||||
base_config_hosts:
|
base_config_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
status:
|
status:
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,25 @@
|
||||||
all:
|
all:
|
||||||
hosts:
|
hosts:
|
||||||
dooris:
|
dooris:
|
||||||
|
ansible_host: dooris.ccchh.net
|
||||||
|
ansible_user: chaos
|
||||||
light:
|
light:
|
||||||
|
ansible_host: light.ccchh.net
|
||||||
|
ansible_user: chaos
|
||||||
opensourcetorrents:
|
opensourcetorrents:
|
||||||
|
ansible_host: opensourcetorrents.ccchh.net
|
||||||
|
ansible_user: chaos
|
||||||
pve01:
|
pve01:
|
||||||
|
ansible_host: pve01.ccchh.net
|
||||||
waybackproxy:
|
waybackproxy:
|
||||||
|
ansible_host: waybackproxy.ccchh.net
|
||||||
|
ansible_user: chaos
|
||||||
yate:
|
yate:
|
||||||
|
ansible_host: yate.ccchh.net
|
||||||
|
ansible_user: chaos
|
||||||
z9-router:
|
z9-router:
|
||||||
|
ansible_host: z9-router.ccchh.net
|
||||||
|
ansible_user: chaos
|
||||||
base_config_hosts:
|
base_config_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
z9-router:
|
z9-router:
|
||||||
|
|
@ -57,9 +70,9 @@ kea_dhcp_hosts:
|
||||||
z9-router:
|
z9-router:
|
||||||
alloy_hosts:
|
alloy_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
dooris:
|
|
||||||
light:
|
light:
|
||||||
yate:
|
yate:
|
||||||
|
dooris:
|
||||||
z9-router:
|
z9-router:
|
||||||
ansible_pull_hosts:
|
ansible_pull_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
|
|
|
||||||
34
known_hosts
34
known_hosts
|
|
@ -1,34 +0,0 @@
|
||||||
acmedns.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJfH16gO1ybLxz/qSwUQxfucwkkKdtaCs3LTm6mn1WBw
|
|
||||||
auth-dns.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICot4CncMY6YA5u6T579uS1zC0OCHqmKdqC1gJLeqVzQ
|
|
||||||
ccchoir.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK9ciwPXufyJe5GOktgR5C9wH+84xNxDwMC2/0ccEZOG
|
|
||||||
chaosknoten.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3OQWuF+rFishyaGnrgyG5HGVocVlewxcYR3RaBaeAw
|
|
||||||
cloud.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7ftSAggvJOW5WdzfocEAx5WGxrA6GgN9LozpX31R/w
|
|
||||||
diday-staging-runner.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII3SR/4wX9dAAna7LNDbnrJdiO/GLMr3HTw1JEq8HWuI
|
|
||||||
dooris.ccchh.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII4g3VSYVjuhgA8JRRplSD7bcjmb9XfFyu5SocHCWtT3
|
|
||||||
eh22-wiki.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBmG79nqY//ZrSURf9EgRHZVU6YWvZVUtHnLpmXorZk
|
|
||||||
forgejo-runner-external.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINP0sfgMZaNJEQxzDrvUdtTHE+cBRg6p4mFGuxe+C5YI
|
|
||||||
forgejo-runner.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO/d7nDDth7U/F/ZO0Ug3S8C0rBARj77UdSCwwPVDZw3
|
|
||||||
grafana.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGlIh+jGr3pA+M0t+LBbXswdwX1vBFcMhuhz+4KOtbC+
|
|
||||||
jitsi.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHQ7sD/LoHl2yiG6HsTujHGbmE72YdqXgtRDKrClqZA
|
|
||||||
keycloak.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM4zJIin5wsYtPy6FfNBq4sWwwLAwD/YNQ8K438ePMXa
|
|
||||||
light.ccchh.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDTn7GK0USwNbONHR9gR4tc+B3iXAisNFIlmm21EUxm6
|
|
||||||
lists.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID7fbN5/jIDd0b6KHJtOjU1u1G6iBm967dym9IegHCji
|
|
||||||
mjolnir.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMR+2CzZC91mT9oU2BbIAqPdl1m3sp2NAKWUoU/T2MKg
|
|
||||||
mumble.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBosJxVv02kX8vdyZfQ8lSQJnNje9id2Dk9LBDwod4ni
|
|
||||||
netbox.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAVLtLRFHBwhbh+rGvon3KvKYuASQ878me8rgXD0ndGq
|
|
||||||
ntfy.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGASO8ZKHX2XUUNA3sdYTEsDnCgrb6M9UeiFsyXcERM3
|
|
||||||
onlyoffice.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBfchhdp2p7+QKoZyQHgRiv+nnGK7scytJjca9WOQgmm
|
|
||||||
opensourcetorrents.ccchh.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBLTNinzCymFZgt5Sb8pk89yfbj9MbiNENh1J0bWeyZh
|
|
||||||
pad.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINysL9KOfnxojDyvPQnzXtHuT+UkqxyDry0vk23eIq1t
|
|
||||||
pretalx.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIInDY4enlTPVohOSBgKc+f3bCFvYvDVYeWNcbYfftYPj
|
|
||||||
public-reverse-proxy.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIexYb1btlzHhjjLRE1hWKOEd6Zuscn8/FgG8SLUjyCh
|
|
||||||
pve01.ccchh.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEFXcy9aD0sPpi+o5zvzy4Iw5jMmNjmJK9N8IVG0mrNk
|
|
||||||
renovate.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN5vVef1U1k3CJx1wNG3PU35+9dAG7+j4Ffu+G7tMfM+
|
|
||||||
router.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGWM1wtkw+yVfZi2e3gRVTpjU3R8Doqlukiv1/ud6Kmv
|
|
||||||
spaceapiccc.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMtggIp8L5i8SWM++hByCQMZJJLnliT0Ost7T4LjzcPN
|
|
||||||
status.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIy1p5fPlmpJAVe8oO/eQjue1cBisxZhfpCizQFp1DTf
|
|
||||||
sunders.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL10d+eTRCl/Ylzds1OvULvtQRhOd+oHqE7mxzomeyfk
|
|
||||||
tickets.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIGVt4P0NkXVlDyOoSMYRBkGnSa433SBb3ZGKvG8ycyp
|
|
||||||
wiki.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG9zxa16pNhD/6Mrr4hhlLowA+3PS/a87EvOA3rSTrQD
|
|
||||||
z9-router.ccchh.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIISqrS1ZQIOO5t62YIHZ66kYkSNZweNfyvXF9o4Npy3X
|
|
||||||
zammad.hosts.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJeoHcaAfZTkvzV464xFEiKhj1CLnO3tnB7A078wMw6e
|
|
||||||
|
|
@ -134,6 +134,10 @@ octopi A 10.89.212.31
|
||||||
|
|
||||||
;cisco-slm248p A 10.89.208.27
|
;cisco-slm248p A 10.89.208.27
|
||||||
|
|
||||||
|
waybackproxy A 10.89.212.33
|
||||||
|
|
||||||
|
alnair A 10.89.210.23
|
||||||
|
TXT "Sun SparcStation 4 Retro"
|
||||||
|
|
||||||
;
|
;
|
||||||
; Public Club Services
|
; Public Club Services
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ server {
|
||||||
# Also provide "_hidden" for by, since it's not relevant.
|
# Also provide "_hidden" for by, since it's not relevant.
|
||||||
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";
|
||||||
|
|
||||||
allow 185.161.129.132/32; # z9
|
allow 185.161.129.134/32; # z9
|
||||||
allow 2a07:c480:0:100::/56; # z9
|
allow 2a07:c480:0:100::/56; # z9
|
||||||
allow 2a07:c481:1::/48; # z9 new ipv6
|
allow 2a07:c481:1::/48; # z9 new ipv6
|
||||||
allow 213.240.180.39/32; # stb home
|
allow 213.240.180.39/32; # stb home
|
||||||
|
|
|
||||||
|
|
@ -80,9 +80,12 @@ services:
|
||||||
- LIST_ATTRIBUTES=chaos@lists.hamburg.ccc.de:mailinglist-chaos,intern@lists.hamburg.ccc.de:mailinglist-intern
|
- LIST_ATTRIBUTES=chaos@lists.hamburg.ccc.de:mailinglist-chaos,intern@lists.hamburg.ccc.de:mailinglist-intern
|
||||||
- MAILMAN_API_PASSWORD={{ secret__lists__rest_password }}
|
- MAILMAN_API_PASSWORD={{ secret__lists__rest_password }}
|
||||||
- MAILMAN_API_URL=http://mailman-core:8001/3.1
|
- MAILMAN_API_URL=http://mailman-core:8001/3.1
|
||||||
|
- MANUAL_SUBSCRIBER_LISTS=/manual-subscriber-lists
|
||||||
image: git.hamburg.ccc.de/ccchh/mailman-subscription-sync:latest
|
image: git.hamburg.ccc.de/ccchh/mailman-subscription-sync:latest
|
||||||
networks:
|
networks:
|
||||||
mailman:
|
mailman:
|
||||||
|
volumes:
|
||||||
|
- /home/chaos/mailman-manual-subscriber-lists:/manual-subscriber-lists
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
mailman:
|
mailman:
|
||||||
|
|
|
||||||
166
ssh.cfg
166
ssh.cfg
|
|
@ -1,166 +0,0 @@
|
||||||
Include ssh.cfg.local
|
|
||||||
|
|
||||||
Host acmedns
|
|
||||||
HostName acmedns.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host auth-dns
|
|
||||||
HostName auth-dns.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
|
|
||||||
Host ccchoir
|
|
||||||
HostName ccchoir.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host chaosknoten
|
|
||||||
HostName chaosknoten.hamburg.ccc.de
|
|
||||||
User root
|
|
||||||
|
|
||||||
Host cloud
|
|
||||||
HostName cloud.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host diday-staging-runner
|
|
||||||
HostName diday-staging-runner.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host dooris
|
|
||||||
HostName dooris.ccchh.net
|
|
||||||
User chaos
|
|
||||||
|
|
||||||
Host eh22-wiki
|
|
||||||
HostName eh22-wiki.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host forgejo-runner-external
|
|
||||||
HostName forgejo-runner-external.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host forgejo-runner
|
|
||||||
HostName forgejo-runner.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host grafana
|
|
||||||
HostName grafana.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host jitsi
|
|
||||||
HostName jitsi.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
|
|
||||||
Host keycloak
|
|
||||||
HostName keycloak.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host light
|
|
||||||
HostName light.ccchh.net
|
|
||||||
User chaos
|
|
||||||
|
|
||||||
Host lists
|
|
||||||
HostName lists.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
|
|
||||||
Host mjolnir
|
|
||||||
HostName mjolnir.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host mumble
|
|
||||||
HostName mumble.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
|
|
||||||
Host netbox
|
|
||||||
HostName netbox.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host ntfy
|
|
||||||
HostName ntfy.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host onlyoffice
|
|
||||||
HostName onlyoffice.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host opensourcetorrents
|
|
||||||
HostName opensourcetorrents.ccchh.net
|
|
||||||
User chaos
|
|
||||||
|
|
||||||
Host pad
|
|
||||||
HostName pad.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host pretalx
|
|
||||||
HostName pretalx.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host public-reverse-proxy
|
|
||||||
HostName public-reverse-proxy.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
|
|
||||||
Host pve01
|
|
||||||
HostName pve01.ccchh.net
|
|
||||||
|
|
||||||
Host renovate
|
|
||||||
HostName renovate.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host router
|
|
||||||
HostName router.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
|
|
||||||
Host spaceapiccc
|
|
||||||
HostName spaceapiccc.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host status
|
|
||||||
HostName status.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
|
|
||||||
Host sunders
|
|
||||||
HostName sunders.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host tickets
|
|
||||||
HostName tickets.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host waybackproxy
|
|
||||||
HostName waybackproxy.ccchh.net
|
|
||||||
User chaos
|
|
||||||
|
|
||||||
Host wiki
|
|
||||||
HostName wiki.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Host yate
|
|
||||||
HostName yate.z9.ccchh.net
|
|
||||||
User chaos
|
|
||||||
|
|
||||||
Host z9-router
|
|
||||||
HostName z9-router.ccchh.net
|
|
||||||
User chaos
|
|
||||||
|
|
||||||
Host zammad
|
|
||||||
HostName zammad.hosts.hamburg.ccc.de
|
|
||||||
User chaos
|
|
||||||
ProxyJump ssh://chaos@router.hamburg.ccc.de
|
|
||||||
|
|
||||||
Loading…
Reference in a new issue