Commit graph

486 commits

Author SHA1 Message Date
1ea9720c7f Merge pull request 'inventory: Fix some linter warnings' (!53) from alex/netz39-infra-ansible:inventory into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/53
Reviewed-by: dkdent <dkdent@netz39.de>
2022-07-23 08:38:07 +00:00
91e803f26d inventory: Join SSH keys to one line
authorized keys content has all those three parts in one line and the
keys for tux and dkdent already have it that way, too.
2022-07-22 07:04:57 +02:00
b85c3aab47 inventory: Fix indentation
Whitespace only. yamllint complained:

    9:5       error    wrong indentation: expected 6 but found 4  (indentation)
    13:7      error    wrong indentation: expected 8 but found 6  (indentation)
    48:7      error    wrong indentation: expected 8 but found 6  (indentation)
    49:81     error    line too long (402 > 80 characters)  (line-length)
    56:7      error    wrong indentation: expected 8 but found 6  (indentation)
    57:81     error    line too long (99 > 80 characters)  (line-length)
2022-07-22 07:04:57 +02:00
8997eb710b inventory: Add missing document start
yamllint warning:

    1:1       warning  missing document start "---"  (document-start)
2022-07-22 07:04:57 +02:00
0f0731d800 inventory: Rename file to add file extension
This is a YAML file, make ansible-lint (and me) happy and add a proper
file extension. Also helps editors to pick correct syntax highlighting.
2022-07-22 07:04:37 +02:00
893d56c56a Merge pull request 'add host oganesson' (!52) from oganesson into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/52
Reviewed-by: Alexander Dahl <alex@netz39.de>
2022-07-22 04:48:31 +00:00
cb85728e26 Add oganesson.n39.eu to inventory 2022-07-20 21:32:26 +02:00
1bd60c190f Add oganesson to main.yml 2022-07-20 21:29:13 +02:00
7367bce954 Add playbook for host oganesson
SSH Jump Host
2022-07-20 21:29:05 +02:00
631f6b0fa7 Merge pull request 'Set docker apt repo matching the Debian release' (!51) from docker_setup-release into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/51
Reviewed-by: Alexander Dahl <alex@netz39.de>
Fixes: #721
2022-07-17 13:45:21 +00:00
b75205f96c Use template to replace Docker apt list entry 2022-07-16 17:03:43 +02:00
af6092576c Add a template for the docker apt list
This template is necessary because the apt_repository role cannot
determine if an entry should be replaced.
2022-07-16 17:03:43 +02:00
tux
acf739831c Merge pull request 'Bump clean_uri to 0.4.0' (!50) from clean_uri-0.4.0 into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/50
Reviewed-by: Alexander Dahl <alex@netz39.de>
2022-07-15 10:22:42 +00:00
13ffacdea2 Bump clean_uri to 0.4.0
This fixes the problem that the Reichelt Canonizer did not regognize
its own URIs.
2022-07-13 21:54:58 +02:00
tux
b24adcc523 Merge pull request 'Set version 0.3.1 for mrtux/clean_uri' (!49) from clean_uri-0.3.1 into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/49
Reviewed-by: dkdent <dkdent@netz39.de>
2022-07-12 11:08:07 +00:00
529efb16a5 Set version 0.3.1 for mrtux/clean_uri 2022-07-10 22:46:22 +02:00
a943116c99 pottwal: Remove trailing whitespace
yamllint and ansible-lint were not happy.

Fixes: f62af6b4e7 ("add hedgedoc config")
2022-07-08 07:20:57 +02:00
tux
6ac66b6894 Merge pull request 'Move LDAP from pottwal to krypton' (!47) from ldap-krypton into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/47
2022-07-07 09:49:20 +00:00
tux
7f5c9ab44a Merge pull request 'Do not emit a change when the apt cache is updated' (!48) from apt-update-without-change into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/48
2022-07-06 14:06:55 +00:00
2b7a62d8a8 Do not emit a change when the apt cache is updated 2022-07-05 21:18:59 +02:00
d0274d7417 Fix container setup
Leave the sync handling for now.
2022-07-05 21:15:32 +02:00
ab0356798e Activate cert handling
Certs will be copied to krypton by deydrated on kant
2022-07-05 20:49:34 +02:00
142fd23720 Move LDAP from pottwal to krypton 2022-07-05 20:37:07 +02:00
5fe1256a5e Inventory: move ldap password to krypton config 2022-07-05 20:34:45 +02:00
tux
9ed6210c40 Merge pull request 'Improve Apache2 setup for ingress proxy' (!46) from improve-proxy-setup into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/46
2022-07-05 17:06:28 +00:00
c36e34966d Merge pull request 'ldap' (!7) from dkdent/netz39-infra-ansible:ldap into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/7
2022-07-05 16:45:32 +00:00
2f78ff74f6 pottwal: ldap dehydrated Config auskommentiert 2022-07-05 17:00:09 +02:00
9bd5d8e71e Make cert availability check more robust 2022-07-04 23:26:49 +02:00
48a4119420 Add rewrite rules for websockets 2022-07-04 23:26:49 +02:00
45206f4413 Add proxy headers 2022-07-04 23:26:49 +02:00
21b6fe0335 Enable proxy modules in Apache2 2022-07-04 23:26:49 +02:00
a070cd48b8 pottwal - add ldap docker similar to pingtech setup 2022-07-04 22:42:07 +02:00
d30eb2df9c Add openldap container on pottwal 2022-07-04 18:43:32 +02:00
405964f8bd Add ldap admin password to inventory 2022-07-04 18:43:32 +02:00
87fe645d8a Add mod headers to apache 2022-07-04 16:17:57 +02:00
754c76882d Merge pull request 'Fix mosquitto conf for version 2.x' (!45) from fix-mosquitto into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/45
2022-07-04 05:27:14 +00:00
1b88909edf Fix mosquitto conf for version 2.x
Apparently Mosquitto had some breaking changes in the configuration,
so we need to add some values to the new version.

This only became visible after the DNS change in our Router. This fix
has been tested and is working.
2022-07-03 23:00:03 +02:00
tux
218fb4786c Merge pull request 'Allow to set backend_host for http proxy' (!44) from host-forward into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/44
2022-07-03 20:58:39 +00:00
tux
6028ad4e6c Merge pull request 'Add VM krypton' (!42) from krypton into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/42
2022-07-03 20:58:13 +00:00
9584d5a1c7 Allow to set backend_host for http proxy 2022-07-01 16:17:24 +02:00
93eec3aec0 Add krypton to inventory 2022-06-29 23:55:38 +02:00
e2f2bb5237 Add call to krypton playbook 2022-06-29 23:55:31 +02:00
2870a8d17d Add playbook for krypton 2022-06-29 23:55:22 +02:00
tux
d868842adf Merge pull request 'Bump unify to v7.1.65' (!41) from unify-v7.1.65 into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/41
2022-06-29 21:33:48 +00:00
99658de89c Bump unicorn to v7.1.65 2022-06-29 23:31:29 +02:00
8f15146e12 Merge pull request 'Add a data_dir variable to prevent confusion' (!40) from data-dir into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/40
2022-06-29 20:38:36 +00:00
6ae3e52403 Introduce a data_dir variable for unicorn
We've had too many confusions about the actual data directory and
unfortunately there are also inconsistencies. So use the data_dir
variable to mask host specific settings.
2022-06-29 00:17:37 +02:00
81a261deb0 Introduce a data_dir variable for radon
We've had too many confusions about the actual data directory and
unfortunately there are also inconsistencies. So use the data_dir
variable to mask host specific settings.
2022-06-29 00:15:56 +02:00
4f78fa9656 Introduce a data_dir variable for pottwal
We've had too many confusions about the actual data directory and
unfortunately there are also inconsistencies. So use the data_dir
variable to mask host specific settings.
2022-06-29 00:15:43 +02:00
db91a7afa5 Introduce a data_dir variable for tau
We've had too many confusions about the actual data directory and
unfortunately there are also inconsistencies. So use the data_dir
variable to mask host specific settings.
2022-06-29 00:14:44 +02:00