Commit graph

609 commits

Author SHA1 Message Date
7a8ef3d4e2 Merge pull request '🔧 Change registry to domain docker.netz39.de' (!145) from docker.netz39.de into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/145
Reviewed-by: dkdent <dkdent@netz39.de>
2023-04-06 18:30:18 +02:00
6631ef4e7f 🔧 Change registry to domain docker.netz39.de
The previous .n39.eu domain is meant to be used within the space only.
Change to the external domain, as the registry is running on our external
server.
2023-04-06 18:17:03 +02:00
d94f5a2882 Merge pull request '🚚 Change internal names from gitea to forgejo' (!143) from 842-forgejo-internal-names into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/143
Reviewed-by: Alexander Dahl <alex@netz39.de>
Reviewed-by: dkdent <dkdent@netz39.de>
2023-04-04 12:58:11 +02:00
4ec9865eeb 🚚 Rename git host_port variable for gitea to forgejo 2023-04-03 13:53:55 +02:00
3b31b3427a 🚚 Rename git container to forgejo
The gitea container must be deleted manually!
2023-04-03 13:53:52 +02:00
7e515c40e2 🚚 Change git data dir from gitea to forgejo
This change includes a manual directory rename on the server
2023-04-03 13:53:48 +02:00
06483df3ac Merge pull request '🎨 Switch from gitea to forgejo' (!142) from switch-to-forgejo into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/142
Reviewed-by: dkdent <dkdent@netz39.de>
Reviewed-by: Alexander Dahl <alex@netz39.de>
2023-04-01 15:41:38 +02:00
d345576eb5 🔧 Rename the git mgmt name to remove "gitea" 2023-03-30 11:37:25 +02:00
6cda14525d 🎨 Switch from gitea to forgejo 2023-03-30 11:37:09 +02:00
357d41d76f Merge pull request '⬆️ Update gitea to 1.19.0' (!141) from gitea-1.19.0 into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/141
Reviewed-by: dkdent <dkdent@netz39.de>
Reviewed-by: Alexander Dahl <alex@netz39.de>
2023-03-30 01:17:00 +02:00
ea3aa9f6cc ⬆️ Update gitea to 1.19.0
Preparation for a switch to Forgejo
2023-03-29 16:37:47 +02:00
195aa3f265 Merge pull request '🩹 fix homebox port' (!140) from fix-homebox-port into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/140
2023-03-22 21:53:04 +01:00
fdbf0aaff2 :bandaid: fix homebox port 2023-03-22 21:29:20 +01:00
c591199988 Merge pull request 'add config for homebox container' (!137) from feat/homebox into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/137
Reviewed-by: Stefan Haun <tux@netz39.de>
2023-03-22 21:05:31 +01:00
8c637f0a1f add entry on holmium to enable https ac cess to inventory.n39.eu 2023-03-20 19:32:41 +01:00
b978a22eba add config for homebox container
add TZ env to homebox container
2023-03-20 19:32:41 +01:00
737dcf50bd Merge pull request '⬆️ Update cleanuri-webui to 0.2.0' (!139) from cleanuri-webui-0.2.0 into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/139
Reviewed-by: dkdent <dkdent@netz39.de>
2023-02-24 19:11:16 +01:00
13a5285f89 ⬆️ Update cleanuri-webui to 0.2.0
https://github.com/penguineer/cleanURI-webui/releases/tag/v0.2.0
2023-02-24 16:39:28 +01:00
c54b47bb5f Merge pull request '⬆️ Upgrade gitea to 1.18.3' (!138) from gitea-upgrade into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/138
2023-02-20 21:10:58 +01:00
f0a68bbaec ⬆️ Upgrade gitea to 1.18.3
Changes to the configuration have been done manually.
2023-02-20 20:54:56 +01:00
054a268331 Merge pull request 'telegraf' (!132) from alex/netz39-infra-ansible:telegraf into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/132
Reviewed-by: dkdent <dkdent@netz39.de>
Reviewed-by: Stefan Haun <tux@netz39.de>
2023-01-12 06:25:28 +01:00
f4c4a42edc 🔧 Fix influxdb org
Unsure why this differs from the previous value, but this is the
organization name actually used by the running database.  Output from
the container:

    2023-01-11T19:22:41Z E! [outputs.influxdb_v2] Failed to write metric to system_metrics (will be dropped: 404 Not Found): not found: organization name "Netz39" not found
2023-01-11 20:49:47 +01:00
366ef720af ⬆️ Bump role version to v0.2.1
Execution of the playbook failed like this before:

    TASK [lespocky.telegraf_docker_in_docker : Copy telegraf docker_input_agent conf] ************************************************************************************************
    fatal: [unicorn.n39.eu]: FAILED! => changed=false
      checksum: 3230d394872351730e265778639936912c9f1030
      msg: Destination directory /etc/telegraf does not exist
    fatal: [krypton.n39.eu]: FAILED! => changed=false
      checksum: 3230d394872351730e265778639936912c9f1030
      msg: Destination directory /etc/telegraf does not exist
    fatal: [radon.n39.eu]: FAILED! => changed=false
      checksum: 3230d394872351730e265778639936912c9f1030
      msg: Destination directory /etc/telegraf does not exist
    fatal: [pottwal.n39.eu]: FAILED! => changed=false
      checksum: 3230d394872351730e265778639936912c9f1030
      msg: Destination directory /etc/telegraf does not exist

That was a bug in the role, which was fixed with release v0.2.1.

Link: https://github.com/LeSpocky/ansible-role-telegraf-docker-in-docker/issues/15
2023-01-11 18:26:33 +01:00
57db3bf0ca 🐳 Add telegraf container for Docker metrics in influxdb
All our hosts running docker can put their metrics into our influxdb
now.

Note: not all docker hosts do this (yet), because the influxdb is
currently only reachable from within the local space internal network in
our rooms.

Link: https://docs.ansible.com/ansible/latest/inventory_guide/intro_patterns.html
Link: https://galaxy.ansible.com/lespocky/telegraf_docker_in_docker
References: #760
2023-01-10 06:26:14 +01:00
4b74ca0d0f 🔨 Move influxdb org to variable
We will need that for deploying telegraf docker metrics container soon.
2023-01-10 06:19:52 +01:00
755f655551 Merge pull request '🔧 Clarify naming of ssh jump host groups' (!136) from alex/netz39-infra-ansible:reorganize_groups into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/136
Reviewed-by: dkdent <dkdent@netz39.de>
Reviewed-by: Stefan Haun <tux@netz39.de>
2023-01-10 06:19:19 +01:00
1c2cea1dda 🔧 Clarify naming of ssh jump host groups
The key difference between these groups is not that one needs a jump
host and the other does not, but that all hosts of one group run on
machines located in the Netz39 rooms in Magdeburg, while the other group
contains only hosts hosted anywhere in the public internet.  We'll need
this distinction for more things than SSH in the future, e.g. PR !132.

(This is also better, because technically there could be a third group
requiring a jump host which is not ssh.n39.eu … 😉 )

Acked-by: Stefan Haun <tux@netz39.de>
Acked-by: David Kilias <dkdent@netz39.de>
2023-01-10 06:15:52 +01:00
2a4630e3b5 Merge pull request ' Install jq on platon' (!135) from platon-jq into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/135
Reviewed-by: Alexander Dahl <alex@netz39.de>
2023-01-09 16:19:59 +01:00
24c8409edc Install jq on platon
This is needed for an improved space status check, see
https://github.com/netz39/rollladensteuerung/pull/25
2023-01-09 15:49:17 +01:00
3f8ddf1e26 Merge pull request 'Change login name for Max2' (!134) from MG-95/netz39-infra-ansible:master into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/134
Reviewed-by: Stefan Haun <tux@netz39.de>
2023-01-09 10:21:39 +01:00
25deedd05f Change login name for Max2 2023-01-09 00:01:10 +01:00
b8603573ce Merge pull request 'Renew SSH key for mg95' (!133) from MG-95/netz39-infra-ansible:master into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/133
Reviewed-by: dkdent <dkdent@netz39.de>
Reviewed-by: Alexander Dahl <alex@netz39.de>
2023-01-08 21:46:32 +01:00
b2698aa975 Renew SSH key for mg95 2023-01-08 19:49:50 +01:00
4f549c3e7b Merge pull request '🚑 pottwal: Change group of prosody certs dir' (!131) from alex/netz39-infra-ansible:prosody-fixup into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/131
Reviewed-by: Stefan Haun <tux@netz39.de>
2023-01-02 20:26:48 +01:00
0e0e93d880 🚑 pottwal: Change group of prosody certs dir
prosody runs as unpriviledged user inside of its docker container with
this uid/gid:

    root@676f7272aaa6:/etc/prosody# id prosody
    uid=101(prosody) gid=102(prosody) groups=102(prosody),101(ssl-cert)

The certs dir has 0750 permissions and thus the process can not access
it and finds no certs, leading to stream errors for s2s and c2s
connections.  We can not use group name, because the same group has a
different gid on the host.  Numerical is fine (even if ansible needs
this as a string, `chown` seems to know how to handle this).

References: !119
Signed-off-by: Alexander Dahl <alex@netz39.de>
2023-01-02 17:58:56 +01:00
fca99114a4 Merge pull request 'prosody: update configuration' (!119) from alex/netz39-infra-ansible:prosody-config into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/119
Reviewed-by: dkdent <dkdent@netz39.de>
Reviewed-by: Stefan Haun <tux@netz39.de>
2023-01-02 16:31:08 +01:00
2c85ab8039 Merge pull request '📝 mailmap: Expand alias to real name' (!130) from mailmap into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/130
2022-12-31 11:53:30 +01:00
1e1a95a87c 📝 mailmap: Expand alias to real name
with consent according to
https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/129/files#issuecomment-3445
2022-12-31 10:43:16 +01:00
d79566f613 🔧 pottwal: Mount prosody config read-only
The prosody process only needs to write in the certs subdirectory.
2022-12-22 11:19:33 +01:00
88e14f7ca6 👌 pottwal: Move prosody config to /etc
Configuration is not data.

Suggested-by: Stefan Haun <tux@netz39.de>
2022-12-22 11:19:33 +01:00
1de850826f 👌 pottwal: Add handler for prosody restart
The XMPP server should be restarted after the config has changed.

Suggested-by: Stefan Haun <tux@netz39.de>
2022-12-22 11:19:33 +01:00
55204a1b21 🔧 prosody: Remove legacy TLS options
Connections to server failed after Let's Encrypt certificate renew.
2022-12-22 11:19:33 +01:00
bd8500bf3a 🔧 prosody: Rework configuration for prosody v0.11
The previous configuration was copied over from helium.n39.eu for
prosody v0.9 and did only work more or less by accident.  The new
configuration was done based on the upstream example configuration.

Some modules we used for 0.9 were replaced, some are not necessary
anymore, some modules are new for 0.11.  The list was reviewed carefully
on a test host, and proved to work for several months there.

The VirtualHost 'localhost' is kept, but moved from a separate
configuration file to the main configuration, because it's only one line
and it's part of the example config anyways.
2022-12-22 11:19:33 +01:00
2c0d00bc28 🔧 prosody: Use ansible variable in main config template 2022-12-22 11:19:33 +01:00
fa811dd787 👌 prosody: Use plain file instead of template
No need to run the template engine, if no replacements are done.

Suggested-by: David Kilias <dkdent@netz39.de>
2022-12-22 11:19:33 +01:00
923dfb49df 🍱 prosody: Import existing configuration files
No changes reported by ansible to what's currently deployed.
2022-12-22 11:19:16 +01:00
055ea84b0d Merge pull request 'docker: Improve deployment' (!128) from alex/netz39-infra-ansible:docker into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/128
Reviewed-by: Stefan Haun <tux@netz39.de>
2022-12-22 11:05:38 +01:00
ae7b65cc5f 🔧 Move docker_setup role application to group playbook
To install docker on a host you have to put it into that group in
inventory now, instead of adding the role to each host playbook.  Idea
is to extend the group docker_host playbook by more docker related
things as for example metrics and monitoring.
2022-12-21 19:00:22 +01:00
083bab14e8 🔧 inventory: Introduce new group 'docker_host'
Hosts which have Docker installed and where containers can run.
Might make it easier to deploy a unified setup on each of them.
2022-12-21 18:54:51 +01:00
ab08f1daa1 🎨 inventory: Sort entries
Makes it easier to compare different groups against each other.
2022-12-21 18:54:51 +01:00