From 1a4815b49697fe4d5553e287c3e0daa9591211e1 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 9 May 2020 18:04:43 +0200 Subject: [PATCH] Update repos and use global env, add ircd --- .gitmodules | 3 ++ git.yml | 1 - group_vars/all | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ ircd.yml | 4 +++ monitoring.yml | 1 - pleroma.yml | 1 - production | 3 ++ roles/database | 2 +- roles/dns | 2 +- roles/git | 2 +- roles/ircd | 1 + roles/monitoring | 2 +- roles/mumble | 2 +- roles/pleroma | 2 +- roles/seedbox | 2 +- roles/tor | 2 +- roles/web | 2 +- roles/wireguard | 2 +- web.yml | 2 -- 19 files changed, 108 insertions(+), 15 deletions(-) create mode 100644 group_vars/all create mode 100644 ircd.yml create mode 160000 roles/ircd diff --git a/.gitmodules b/.gitmodules index 347be52..711b587 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "roles/seedbox"] path = roles/seedbox url = https://git.redxen.eu/RedXen/ansible-seedbox +[submodule "roles/ircd"] + path = roles/ircd + url = https://git.redxen.eu/RedXen/ircd-ansible diff --git a/git.yml b/git.yml index 34b55e2..79fa72d 100644 --- a/git.yml +++ b/git.yml @@ -1,7 +1,6 @@ --- - hosts: git vars_files: - - '{{ role_path }}/vars/domains.yml' - '{{ role_path }}/vars/database.yml' - '{{ role_path }}/vault/keys.yml' roles: diff --git a/group_vars/all b/group_vars/all new file mode 100644 index 0000000..165e350 --- /dev/null +++ b/group_vars/all @@ -0,0 +1,87 @@ +services: + haproxy: + ports: + https: + - 443 + tcp: + - 2202 # Gitea SSH + #- 64738 # Mumble + #- 25565 # Minecraft + public: + # These are load balanced, it doesn't matter what IP they point to + - {domain: "dev-stats", service: "grafana", httpchk: true} + - {domain: "dev-gitea", service: "gitea", httpchk: true} + - {domain: "dev-transmission", service: "transmission", httpchk: false} + - {domain: "dev-sd", service: "seedown", httpchk: true} + unbound: + internal: + local: + SRV: + - {service: "gitea", port: 3200, group: "git"} + - {service: "seedown", port: 8082, group: "seedbox"} + - {service: "transmission", port: 8081, group: "seedbox"} + - {service: "grafana", port: 3000, group: "monitoring"} + CNAME: + - {service: "postgres", host: "n0"} + - {service: "redis", host: "n0"} + - {service: "influxdb", host: "n0"} + remote: + - {service: "homepage", port: "80", domain: "rxhome.s3-website.eu-central-1.amazonaws.com."} + grafana: + domain: "dev-stats.redxen.eu" + port: 3000 + postgres: + host: "postgres.redxen.localhost" + port: 5432 + redis: + host: "redis.redxen.localhost" + port: 6379 + gitea: + user: "git" + domain: "dev-gitea.redxen.eu" + port: + http: 3200 + ssh: 2442 + mumble: + configpath: '/etc/mumble-server.ini' + port: 6400 + register: + host: "redxen.eu" + url: "redxen.eu" + transmission: + root_dir: "/mnt/seedbox" # TODO: Use mount UUIDs + port: + peer: 51413 + rpc: 8081 + darkhttpd: + path: "/etc/darkhttpd" + influxdb: + port: 8086 + tor: + listen: + socks: + addr: "127.0.0.1" + port: 9050 + http: + addr: "127.0.0.1" + port: 7050 + wireguard: + interface: 'wg0' + port: 51820 + net: + v4: + addr: "172.22.12" + range: + serv: 24 + clnt: 32 + v6: + addr: "fd86:ea04:1115:" + range: + serv: 120 + clnt: 128 + peers: + - { bit: 2, pubkey: "Xb+ASR5NdnIB+dXWEA4H0V3d0LC0KocKeFeQDyqDqjk=" } + - { bit: 3, pubkey: "kz9vLMnPtfka11n1EJpzHb4966ieJSo4BU1P2joHLXo=" } + - { bit: 10, pubkey: "wpjMlhrcv173ER7rZ0KrmaqahcqZA/fm3ovpaGlRIRo=" } + - { bit: 12, pubkey: "2FRcncz/oSmqFQLrHqICi4fEkgxrCeS9P8TTv5gcfCw=" } + - { bit: 14, pubkey: "XYUXzDDXzo1uDadvJ8YW5X/ISCZSyu10d35i7mb0pAY=" } diff --git a/ircd.yml b/ircd.yml new file mode 100644 index 0000000..a9e436b --- /dev/null +++ b/ircd.yml @@ -0,0 +1,4 @@ +--- +- hosts: ircd + roles: + - ircd diff --git a/monitoring.yml b/monitoring.yml index 683bfd2..36382bf 100644 --- a/monitoring.yml +++ b/monitoring.yml @@ -2,7 +2,6 @@ - hosts: monitoring vars_files: - '{{ role_path }}/vars/database.yml' - - '{{ role_path }}/vars/domains.yml' - '{{ role_path }}/vault/keys.yml' roles: - monitoring diff --git a/pleroma.yml b/pleroma.yml index 04135c5..933a990 100644 --- a/pleroma.yml +++ b/pleroma.yml @@ -1,7 +1,6 @@ --- - hosts: pleroma vars_files: - - '{{ role_path }}/vars/domains.yml' - '{{ role_path }}/vars/database.yml' - '{{ role_path }}/vault/keys.yml' roles: diff --git a/production b/production index ad9bbee..d19ba76 100644 --- a/production +++ b/production @@ -29,3 +29,6 @@ n0 [seedbox] n0 + +[pleroma] +n0 diff --git a/roles/database b/roles/database index 8dff1d0..fcb4cc9 160000 --- a/roles/database +++ b/roles/database @@ -1 +1 @@ -Subproject commit 8dff1d0d33d3369b83b703879c2478e586a06124 +Subproject commit fcb4cc9dabb64f5558856fdbd77d9f23bfba6e88 diff --git a/roles/dns b/roles/dns index b33fa00..bdb4b20 160000 --- a/roles/dns +++ b/roles/dns @@ -1 +1 @@ -Subproject commit b33fa00c7674e3fcb005923b9947b6e3dbf69e53 +Subproject commit bdb4b20d35058ae940c7e81e7244b47ecdf890d1 diff --git a/roles/git b/roles/git index 5982eba..8e906d9 160000 --- a/roles/git +++ b/roles/git @@ -1 +1 @@ -Subproject commit 5982eba06b0c200ff7e22ce641d366650696cf97 +Subproject commit 8e906d97e61ee05aa4ca49e6377bca9cac4552e2 diff --git a/roles/ircd b/roles/ircd new file mode 160000 index 0000000..15d48d1 --- /dev/null +++ b/roles/ircd @@ -0,0 +1 @@ +Subproject commit 15d48d1b6226b68115283ed764868c80a5a77807 diff --git a/roles/monitoring b/roles/monitoring index ba6610e..4c58df3 160000 --- a/roles/monitoring +++ b/roles/monitoring @@ -1 +1 @@ -Subproject commit ba6610e22a91835a866dd60681dff3d1da6b1a61 +Subproject commit 4c58df3060479b809f2518bf2346c8150f97b1f7 diff --git a/roles/mumble b/roles/mumble index 75fd403..0548bb0 160000 --- a/roles/mumble +++ b/roles/mumble @@ -1 +1 @@ -Subproject commit 75fd4036c995531ff5bbc62f05277f36e451d733 +Subproject commit 0548bb0340bdb13fcf94da8e603faae09da8b84b diff --git a/roles/pleroma b/roles/pleroma index 992e072..601f404 160000 --- a/roles/pleroma +++ b/roles/pleroma @@ -1 +1 @@ -Subproject commit 992e072228c943131e257dfaabd913398a34e1f4 +Subproject commit 601f4041a0ba471604f9d6ee9329dfb934f10968 diff --git a/roles/seedbox b/roles/seedbox index 2591c7b..e9da76b 160000 --- a/roles/seedbox +++ b/roles/seedbox @@ -1 +1 @@ -Subproject commit 2591c7b3b616a36888a87aec2727794cf9b39c8e +Subproject commit e9da76b3645b1297973f962fa81623354d9e5d28 diff --git a/roles/tor b/roles/tor index 63873d8..ecc6fc9 160000 --- a/roles/tor +++ b/roles/tor @@ -1 +1 @@ -Subproject commit 63873d89d13c6df9aa4fec9d2e94e604b4bc4b0f +Subproject commit ecc6fc928de5ada2564f3be2187d4bc7db9857b9 diff --git a/roles/web b/roles/web index b5568de..be37b98 160000 --- a/roles/web +++ b/roles/web @@ -1 +1 @@ -Subproject commit b5568de7c5bda3f0965e9ddedaf71fb4a31dadd8 +Subproject commit be37b988c474a852c1d4f8d58f9ab09497873636 diff --git a/roles/wireguard b/roles/wireguard index 0cd5cb1..6a30a73 160000 --- a/roles/wireguard +++ b/roles/wireguard @@ -1 +1 @@ -Subproject commit 0cd5cb1cf8c9d1da13a7826678626c6c8d9254c7 +Subproject commit 6a30a736fbfd76622871ffe58ba214815961612d diff --git a/web.yml b/web.yml index b22ce14..94eaccb 100644 --- a/web.yml +++ b/web.yml @@ -1,6 +1,4 @@ --- - hosts: web - vars_files: - - '{{ role_path }}/vars/domains.yml' roles: - web