From fb7d7eaa22eaf5003469ee4f85dc3683766da3a0 Mon Sep 17 00:00:00 2001 From: Alex Palaistras Date: Sat, 27 Mar 2021 23:03:56 +0000 Subject: [PATCH] Use `podman run` instead of `create && start` And correctly remove containers if systemd services are stopped. --- .../service/biboumi/systemd/biboumi.service | 8 ++++---- .../discord-ircd/systemd/discord-ircd.service | 8 ++++---- .../service/dovecot/systemd/dovecot.service | 16 ++++++++-------- .../git/systemd/git-ssh-ed25519@.service | 4 ++-- .../git/systemd/git-ssh-pubkey@.service | 4 ++-- config/service/git/systemd/git.service | 11 +++++------ .../service/mariadb/systemd/mariadb.service | 8 ++++---- .../nginx/systemd/nginx-ingress.service | 12 ++++++------ .../service/nginx/systemd/nginx-php@.service | 12 ++++++------ .../nginx/systemd/nginx-static@.service | 4 ++-- .../service/postfix/systemd/postfix.service | 12 ++++++------ .../service/prosody/systemd/prosody.service | 12 ++++++------ .../service/radicale/systemd/radicale.service | 10 +++++----- config/service/redis/systemd/redis.service | 8 ++++---- config/service/rspamd/systemd/rspamd.service | 10 +++++----- host/lhr01nuc/lhr01nuc.env.gpg | Bin 1637 -> 2429 bytes host/lhr01nuc/spec.fcc | 1 + 17 files changed, 70 insertions(+), 70 deletions(-) diff --git a/config/service/biboumi/systemd/biboumi.service b/config/service/biboumi/systemd/biboumi.service index 5ba2cae..c99095d 100644 --- a/config/service/biboumi/systemd/biboumi.service +++ b/config/service/biboumi/systemd/biboumi.service @@ -6,11 +6,11 @@ After=container-build@%N.service prosody.service [Service] Restart=always ExecStartPre=/bin/install --owner 10000 --group 10000 -d /var/lib/container-service/%N -ExecStartPre=/bin/podman create --replace --pull never --net prosody --env-file /etc/container-service/%N/%N.env \ - --volume /var/lib/container-service/%N:/var/lib/%N:z \ - --name %N localhost/%N:latest -ExecStart=/bin/podman start --attach %N +ExecStart=/bin/podman run --replace --pull never --net prosody --env-file /etc/container-service/%N/%N.env \ + --volume /var/lib/container-service/%N:/var/lib/%N:z \ + --name %N localhost/%N:latest ExecStop=/bin/podman stop --time 10 %N +ExecStopPost=/bin/podman rm --force %N [Install] WantedBy=multi-user.target diff --git a/config/service/discord-ircd/systemd/discord-ircd.service b/config/service/discord-ircd/systemd/discord-ircd.service index 3ba7dea..d311d41 100644 --- a/config/service/discord-ircd/systemd/discord-ircd.service +++ b/config/service/discord-ircd/systemd/discord-ircd.service @@ -6,11 +6,11 @@ After=container-build@%N.service container-network@prosody.service [Service] Restart=always ExecStartPre=/bin/install --owner 10000 --group 10000 -d /var/lib/container-service/%N -ExecStartPre=/bin/podman create --replace --pull never --net prosody --env-file /etc/container-service/%N/%N.env \ - --volume /var/lib/container-service/%N:/var/lib/rdircd:z \ - --name %N localhost/%N:latest -ExecStart=/bin/podman start --attach %N +ExecStart=/bin/podman run --replace --pull never --net prosody --env-file /etc/container-service/%N/%N.env \ + --volume /var/lib/container-service/%N:/var/lib/rdircd:z \ + --name %N localhost/%N:latest ExecStop=/bin/podman stop --time 10 %N +ExecStopPost=/bin/podman rm --force %N [Install] WantedBy=multi-user.target diff --git a/config/service/dovecot/systemd/dovecot.service b/config/service/dovecot/systemd/dovecot.service index 1128bbd..3c7af01 100644 --- a/config/service/dovecot/systemd/dovecot.service +++ b/config/service/dovecot/systemd/dovecot.service @@ -6,15 +6,15 @@ After=container-build@%N.service container-network@mail.service container-networ [Service] Restart=always ExecStartPre=/bin/install --owner 5000 --group 5000 -d /var/lib/container-service/mail -ExecStartPre=/bin/podman create --replace --pull never --net internal,mail,mariadb --env-file /etc/container-service/%N/%N.env \ - --env-file /etc/container-service/rspamd/rspamd.env \ - --publish 143:143 --publish 993:993 \ - --volume /var/lib/container-service/mail:/var/mail:z \ - --volume /etc/container-service/%N/service/config:/etc/%N/conf.d:z \ - --volume /var/lib/container-service/letsencrypt/private:/etc/ssl/private:z \ - --name %N localhost/%N:latest -ExecStart=/bin/podman start --attach %N +ExecStart=/bin/podman run --replace --pull never --net internal,mail,mariadb --env-file /etc/container-service/%N/%N.env \ + --env-file /etc/container-service/rspamd/rspamd.env \ + --publish 143:143 --publish 993:993 \ + --volume /var/lib/container-service/mail:/var/mail:z \ + --volume /etc/container-service/%N/service/config:/etc/%N/conf.d:z \ + --volume /var/lib/container-service/letsencrypt/private:/etc/ssl/private:z \ + --name %N localhost/%N:latest ExecStop=/bin/podman stop --time 10 %N +ExecStopPost=/bin/podman rm --force %N [Install] WantedBy=multi-user.target diff --git a/config/service/git/systemd/git-ssh-ed25519@.service b/config/service/git/systemd/git-ssh-ed25519@.service index edaba5e..5a8ec5c 100644 --- a/config/service/git/systemd/git-ssh-ed25519@.service +++ b/config/service/git/systemd/git-ssh-ed25519@.service @@ -12,8 +12,8 @@ ExecStart=/bin/sh -c "echo 'ssh-ed25519 %I' > ${GIT_HOME}/.ssh/authorized_keys.d ExecStartPost=/bin/sh -c "cat ${GIT_HOME}/.ssh/authorized_keys.d/* > /tmp/authorized_keys" ExecStartPost=/bin/install --owner 10000 --group 10000 -m 0600 /tmp/authorized_keys ${GIT_HOME}/.ssh/authorized_keys ExecStop=/bin/rm -f ${GIT_HOME}/.ssh/authorized_keys.d/%i -ExecStartPost=/bin/sh -c "cat ${GIT_HOME}/.ssh/authorized_keys.d/* > /tmp/authorized_keys" -ExecStartPost=/bin/install --owner 10000 --group 10000 -m 0600 /tmp/authorized_keys ${GIT_HOME}/.ssh/authorized_keys +ExecStopPost=/bin/sh -c "cat ${GIT_HOME}/.ssh/authorized_keys.d/* > /tmp/authorized_keys" +ExecStopPost=/bin/install --owner 10000 --group 10000 -m 0600 /tmp/authorized_keys ${GIT_HOME}/.ssh/authorized_keys [Install] WantedBy=multi-user.target diff --git a/config/service/git/systemd/git-ssh-pubkey@.service b/config/service/git/systemd/git-ssh-pubkey@.service index c34fc67..7e18af5 100644 --- a/config/service/git/systemd/git-ssh-pubkey@.service +++ b/config/service/git/systemd/git-ssh-pubkey@.service @@ -12,8 +12,8 @@ ExecStart=/bin/install -m 0600 -D %I ${GIT_HOME}/.ssh/authorized_keys.d/%i ExecStartPost=/bin/sh -c "cat ${GIT_HOME}/.ssh/authorized_keys.d/* > /tmp/authorized_keys" ExecStartPost=/bin/install --owner 10000 --group 10000 -m 0600 /tmp/authorized_keys ${GIT_HOME}/.ssh/authorized_keys ExecStop=/bin/rm -f ${GIT_HOME}/.ssh/authorized_keys.d/%i -ExecStartPost=/bin/sh -c "cat ${GIT_HOME}/.ssh/authorized_keys.d/* > /tmp/authorized_keys" -ExecStartPost=/bin/install --owner 10000 --group 10000 -m 0600 /tmp/authorized_keys ${GIT_HOME}/.ssh/authorized_keys +ExecStopPost=/bin/sh -c "cat ${GIT_HOME}/.ssh/authorized_keys.d/* > /tmp/authorized_keys" +ExecStopPost=/bin/install --owner 10000 --group 10000 -m 0600 /tmp/authorized_keys ${GIT_HOME}/.ssh/authorized_keys [Install] WantedBy=multi-user.target diff --git a/config/service/git/systemd/git.service b/config/service/git/systemd/git.service index b185dab..4ecdd4c 100644 --- a/config/service/git/systemd/git.service +++ b/config/service/git/systemd/git.service @@ -6,13 +6,12 @@ After=container-build@%N.service container-network@%N.service container-network@ [Service] Restart=always ExecStartPre=/bin/install --owner 10000 --group 10000 -d /var/lib/container-service/%N -ExecStartPre=/bin/podman create --replace --pull never --net internal,%N \ - --cap-add AUDIT_WRITE \ - --publish 468:22 \ - --volume /var/lib/container-service/%N:/home/git:z \ - --name %N localhost/%N:latest -ExecStart=/bin/podman start --attach %N +ExecStart=/bin/podman run --replace --pull never --net internal,%N --cap-add AUDIT_WRITE \ + --publish 468:22 \ + --volume /var/lib/container-service/%N:/home/git:z \ + --name %N localhost/%N:latest ExecStop=/bin/podman stop --time 10 %N +ExecStopPost=/bin/podman rm --force %N [Install] WantedBy=multi-user.target diff --git a/config/service/mariadb/systemd/mariadb.service b/config/service/mariadb/systemd/mariadb.service index 533256c..0b7f531 100644 --- a/config/service/mariadb/systemd/mariadb.service +++ b/config/service/mariadb/systemd/mariadb.service @@ -7,15 +7,15 @@ After=container-build@%N.service container-network@%N.service container-network@ Restart=always EnvironmentFile=/etc/container-service/%N/%N.env ExecStartPre=/bin/install --owner 999 --group 999 -d /var/lib/container-service/%N -ExecStartPre=/bin/podman create --replace --pull never --net internal,%N --env-file /etc/container-service/%N/%N.env \ - --volume /var/lib/container-service/%N:/var/lib/mysql:z \ - --name %N localhost/%N:latest -ExecStart=/bin/podman start --attach %N +ExecStart=/bin/podman run --replace --pull never --net internal,%N --env-file /etc/container-service/%N/%N.env \ + --volume /var/lib/container-service/%N:/var/lib/mysql:z \ + --name %N localhost/%N:latest ExecStartPost=/bin/podman run --replace --pull never --rm --net %N --entrypoint mariadb-admin \ --volume /var/lib/container-service/%N:/var/lib/mysql:z \ --name %N-wait localhost/%N:latest \ --host mariadb --user root --password=${MYSQL_ROOT_PASSWORD} --wait=10 ping ExecStop=/bin/podman stop --time 10 %N +ExecStopPost=/bin/podman rm --force %N [Install] WantedBy=multi-user.target diff --git a/config/service/nginx/systemd/nginx-ingress.service b/config/service/nginx/systemd/nginx-ingress.service index 252749a..11e6819 100644 --- a/config/service/nginx/systemd/nginx-ingress.service +++ b/config/service/nginx/systemd/nginx-ingress.service @@ -7,13 +7,13 @@ After=container-build@nginx.service container-network@%N.service Restart=always ExecStartPre=/bin/install --owner 10000 --group 10000 -d /var/lib/container-service/letsencrypt/private ExecStartPre=/bin/install -d /var/lib/container-service/%N/conf.d -ExecStartPre=/bin/podman create --replace --pull never --net %N \ - --publish 80:80 --publish 443:443 \ - --volume /var/lib/container-service/letsencrypt/private:/etc/ssl/private:z \ - --volume /var/lib/container-service/%N/conf.d:/etc/nginx/conf.d:z \ - --name %N localhost/nginx:latest -ExecStart=/bin/podman start --attach %N +ExecStart=/bin/podman run --replace --pull never --net %N \ + --publish 80:80 --publish 443:443 \ + --volume /var/lib/container-service/letsencrypt/private:/etc/ssl/private:z \ + --volume /var/lib/container-service/%N/conf.d:/etc/nginx/conf.d:z \ + --name %N localhost/nginx:latest ExecStop=/bin/podman stop --time 10 %N +ExecStopPost=/bin/podman rm --force %N ExecReload=/bin/podman exec %N nginx -s reload [Install] diff --git a/config/service/nginx/systemd/nginx-php@.service b/config/service/nginx/systemd/nginx-php@.service index c4dc1fe..70c4fed 100644 --- a/config/service/nginx/systemd/nginx-php@.service +++ b/config/service/nginx/systemd/nginx-php@.service @@ -7,21 +7,21 @@ Before=nginx-ingress-http@%i.service [Service] Restart=always Environment=SERVER_NAME=%i +Environment=SERVICE_DATA_DIRECTORY=/data Environment=NGINX_CONF=/etc/container-service/nginx/service/%p.conf.template ExecStartPre=/bin/install --owner 33 --group 33 -d /var/lib/container-service/%i -ExecStartPre=/bin/podman pod create --replace --net mariadb,nginx-ingress --name %i -ExecStartPre=/bin/podman create --replace --pull never --pod %i \ - --env-file /etc/container-service/%i/%i.env \ - --volume /var/lib/container-service/%i:/data:z \ +ExecStartPre=/bin/podman pod create --replace --net internal,nginx-ingress --name %i +ExecStartPre=/bin/podman create --replace --pull never --pod %i --env-file /etc/container-service/%i/%i.env \ + --volume /var/lib/container-service/%i:${SERVICE_DATA_DIRECTORY}:z,shared \ --name %i-php localhost/%i:latest ExecStartPre=/bin/podman create --replace --pull never --pod %i \ --volumes-from=%i-php:z,ro \ --name %i-nginx localhost/nginx:latest ExecStartPre=/bin/sh -c "envsubst '$SERVER_NAME' < ${NGINX_CONF} > /tmp/%i.conf" -ExecStartPre=/bin/podman cp /tmp/%i.conf %i-nginx:/etc/nginx/conf.d -ExecStartPre=/bin/rm -f /tmp/%i.conf +ExecStartPre=/bin/sh -c "podman cp /tmp/%i.conf %i-nginx:/etc/nginx/conf.d && rm -f /tmp/%i.conf" ExecStart=/bin/sh -c 'podman pod start %i && podman wait %i-php && podman attach --no-stdin %i-php' ExecStop=/bin/podman pod stop --time 10 %i +ExecStopPost=/bin/podman pod rm --force %i [Install] Alias=%i.service diff --git a/config/service/nginx/systemd/nginx-static@.service b/config/service/nginx/systemd/nginx-static@.service index 49285b4..059a9ae 100644 --- a/config/service/nginx/systemd/nginx-static@.service +++ b/config/service/nginx/systemd/nginx-static@.service @@ -10,10 +10,10 @@ Environment=SERVER_NAME=%i Environment=NGINX_CONF=/etc/container-service/nginx/service/%p.conf.template ExecStartPre=/bin/podman create --replace --pull never --net nginx-ingress --name %i localhost/%i:latest ExecStartPre=/bin/sh -c "envsubst '$SERVER_NAME' < ${NGINX_CONF} > /tmp/%i.conf" -ExecStartPre=/bin/podman cp /tmp/%i.conf %i:/etc/nginx/conf.d -ExecStartPre=/bin/rm -f /tmp/%i.conf +ExecStartPre=/bin/sh -c "podman cp /tmp/%i.conf %i:/etc/nginx/conf.d && rm -f /tmp/%i.conf" ExecStart=/bin/podman start --attach %i ExecStop=/bin/podman stop --time 10 %i +ExecStopPost=/bin/podman rm --force %i [Install] Alias=%i.service diff --git a/config/service/postfix/systemd/postfix.service b/config/service/postfix/systemd/postfix.service index 529658a..7c5d5a0 100644 --- a/config/service/postfix/systemd/postfix.service +++ b/config/service/postfix/systemd/postfix.service @@ -6,13 +6,13 @@ After=container-build@%N.service container-network@mail.service container-networ [Service] Restart=always ExecStartPre=/bin/install --owner 5000 --group 5000 -d /var/lib/container-service/mail -ExecStartPre=/bin/podman create --replace --pull never --net internal,mail --env-file /etc/container-service/%N/%N.env \ - --publish 25:25 --publish 465:465 --publish 587:587 \ - --volume /var/lib/container-service/mail:/var/mail:z \ - --volume /var/lib/container-service/letsencrypt/private:/etc/ssl/private:z \ - --name %N localhost/%N:latest -ExecStart=/bin/podman start --attach %N +ExecStart=/bin/podman run --replace --pull never --net internal,mail --env-file /etc/container-service/%N/%N.env \ + --publish 25:25 --publish 465:465 --publish 587:587 \ + --volume /var/lib/container-service/mail:/var/mail:z \ + --volume /var/lib/container-service/letsencrypt/private:/etc/ssl/private:z \ + --name %N localhost/%N:latest ExecStop=/bin/podman stop --time 10 %N +ExecStopPost=/bin/podman rm --force %N [Install] WantedBy=multi-user.target diff --git a/config/service/prosody/systemd/prosody.service b/config/service/prosody/systemd/prosody.service index a5aa59d..d694a00 100644 --- a/config/service/prosody/systemd/prosody.service +++ b/config/service/prosody/systemd/prosody.service @@ -6,13 +6,13 @@ After=container-build@%N.service container-network@%N.service mariadb.service po [Service] Restart=always ExecStartPre=/bin/install --owner 101 --group 102 -d /var/lib/container-service/%N -ExecStartPre=/bin/podman create --replace --pull never --net mariadb,%N --env-file /etc/container-service/%N/%N.env \ - --publish 5222:5222 --publish 5269:5269 --publish 5347:5347 \ - --volume /var/lib/container-service/%N:/var/lib/%N:z --volume /etc/container-service/%N/service/config:/etc/%N/conf.d:z \ - --volume /var/lib/container-service/letsencrypt/private:/etc/ssl/private:z \ - --name %N localhost/%N:latest -ExecStart=/bin/podman start --attach %N +ExecStart=/bin/podman run --replace --pull never --net mariadb,%N --env-file /etc/container-service/%N/%N.env \ + --publish 5222:5222 --publish 5269:5269 --publish 5347:5347 \ + --volume /var/lib/container-service/%N:/var/lib/%N:z --volume /etc/container-service/%N/service/config:/etc/%N/conf.d:z \ + --volume /var/lib/container-service/letsencrypt/private:/etc/ssl/private:z \ + --name %N localhost/%N:latest ExecStop=/bin/podman stop --time 10 %N +ExecStopPost=/bin/podman rm --force %N [Install] WantedBy=multi-user.target diff --git a/config/service/radicale/systemd/radicale.service b/config/service/radicale/systemd/radicale.service index e24764d..e35d716 100644 --- a/config/service/radicale/systemd/radicale.service +++ b/config/service/radicale/systemd/radicale.service @@ -6,12 +6,12 @@ After=container-build@%N.service dovecot.service [Service] Restart=always ExecStartPre=/bin/install --owner 15232 --group 15232 -d /var/lib/container-service/%N -ExecStartPre=/bin/podman create --replace --pull never --net mail --env-file /etc/container-service/%N/%N.env \ - --publish 5232:5232 \ - --volume /var/lib/container-service/%N:/var/lib/%N:z \ - --name %N localhost/%N:latest -ExecStart=/bin/podman start --attach %N +ExecStart=/bin/podman run --replace --pull never --net mail --env-file /etc/container-service/%N/%N.env \ + --publish 5232:5232 \ + --volume /var/lib/container-service/%N:/var/lib/%N:z \ + --name %N localhost/%N:latest ExecStop=/bin/podman stop --time 10 %N +ExecStopPost=/bin/podman rm --force %N [Install] WantedBy=multi-user.target diff --git a/config/service/redis/systemd/redis.service b/config/service/redis/systemd/redis.service index 363ec03..c88332d 100644 --- a/config/service/redis/systemd/redis.service +++ b/config/service/redis/systemd/redis.service @@ -6,11 +6,11 @@ After=container-build@%N.service container-network@%N.service container-network@ [Service] Restart=always ExecStartPre=/bin/install --owner 999 --group 1000 -d /var/lib/container-service/%N -ExecStartPre=/bin/podman create --replace --pull never --net internal,%N \ - --volume /var/lib/container-service/%N:/data:z \ - --name %N localhost/%N:latest -ExecStart=/bin/podman start --attach %N +ExecStart=/bin/podman run --replace --pull never --net internal,%N \ + --volume /var/lib/container-service/%N:/data:z \ + --name %N localhost/%N:latest ExecStop=/bin/podman stop --time 10 %N +ExecStopPost=/bin/podman rm --force %N [Install] WantedBy=multi-user.target diff --git a/config/service/rspamd/systemd/rspamd.service b/config/service/rspamd/systemd/rspamd.service index fe64fdd..7636475 100644 --- a/config/service/rspamd/systemd/rspamd.service +++ b/config/service/rspamd/systemd/rspamd.service @@ -6,12 +6,12 @@ After=container-build@%N.service container-network@mail.service container-networ [Service] Restart=always ExecStartPre=/bin/install --owner 11332 --group 11332 -d /var/lib/container-service/%N -ExecStartPre=/bin/podman create --replace --pull never --net internal,mail,redis --env-file /etc/container-service/%N/%N.env \ - --publish 11332:11332 --publish 11334:11334 \ - --volume /var/lib/container-service/%N:/var/lib/%N:z \ - --name %N localhost/%N:latest -ExecStart=/bin/podman start --attach %N +ExecStart=/bin/podman run --replace --pull never --net internal,mail,redis --env-file /etc/container-service/%N/%N.env \ + --publish 11332:11332 --publish 11334:11334 \ + --volume /var/lib/container-service/%N:/var/lib/%N:z \ + --name %N localhost/%N:latest ExecStop=/bin/podman stop --time 10 %N +ExecStopPost=/bin/podman rm --force %N [Install] WantedBy=multi-user.target diff --git a/host/lhr01nuc/lhr01nuc.env.gpg b/host/lhr01nuc/lhr01nuc.env.gpg index 94e4c9b43cd0f55f4c4b294b09e28e4c2f8f23b7..92f39c0f535bbc0995d8b1c16c619ea1a5754844 100644 GIT binary patch literal 2429 zcmV-@34->80t^E@y8KTiHb4#m5B(gR65kPPeWw74miOa@eykdE+VEV24H^bzqUz{P z0zn;uFrB`P{7)}O#|~u}>M0lBnSk1CShcO^6ZfMtyj;${PH9>Mc{=l0E3SoP!H^{+ z8)^LAilMrZ0?pV5I+Dyn@O$NI0%xZy7UN`QN2vyoHl^&`99x^2K0UXwro7YyBKqdL zsiIjLL&>n6va~=zIcCaCw5ZJA$h$7A#0c?nnmMU1{I$D}@-)_ZUlC~19Avdq7g&pf zq-a|i7Gm--^0-iP+O#^uuRx-{($ulg_^a8oTm%L`?W~T(6gHb0$ZxkoP26wGP~XDh z{j+oKCDqJAgJ;XnnvBLjD?$ZK9MimUB{Ot*zMzB6ij4ZGZ^xZSL;Em#=%IK(4%@*P zV@7&AmwD;QhFVBl+X*7V*Flhy*rSI7pEgfppL?0Xq8t7rQ;4skOj#2irw&x-2~8W0 zZ+Gt$61-k^{zBH8-x~d!HuDAeOQ;b5*UX7N|k2 zj3}LQi`SU8(O|ABk(pv}}Enk=xci|gM`f?5V3HGBg}2U%~VODOkt;#lE8NA?~6x+QQu3e%6wM|h#C zKXZq_^ma@DYKJjN=B1@c>ZbbXwdZ@Q{yYQL_SGEL5&e z;cS{WJ*ecN6+al4TiI|3@-w$`Xf!;jwdFATV&R#_Xs&reEe))wR3z)E*Hp!dw-pXg z@?fN)jlmUq_Tn$radr3A1tq1H-X)p0?3mC3_>-htxXE{urM|vT%-jBUu2=_vqqmdW z*%Kt_rUmy9BInAhojbo0y$$l z1_1EFMe=|Rh;aMTwW|J2E>4J7(l+6Q znY9aAZxRWfOAh9JmlhFPuWfYZL?)mr(rsuODoTyDd}9GoW_D0@#;avc=lz$)@vMd2 z_1|6tJkiL1#`{raHe!y^6RHqO5An{v8rGDl6zt9EYe_pr6ULb=%w@MexZHC!o$t+r zIaUTFw07(}hyug*(ooNEnYP6@WzgPA5me0I1Tb2L3L!G&Ue42YNr%PcDb$;3ic0(peGfqfoVD0`9&AO+RC zZA%p)^d{k)vBmgVdX(&#Y^S*WUw=xeR45+vEtS%-72C)WZp2$vVc)ez#n^TI zL>AQ)tV>bU@=k=hN4SP3<99Ic9Ktl~N+}AB$&~uoSX@soD(M3R3%&A>6u@_W0s%di zxGz5fxnH~gI=$R2Zy3r*G5`4?n=?qkzpIU7u6Z^c7D|P<_sHa3__t#YCg0?bP5nvz zDJBvb3{g*{RXVcR+0htf$Q7zx;KMC6kDyi@=@zuF?5u4#dsh{*Ft(CzD25>w1RLK% z$|KlXFcjjuT0&+DW1>xn@+~77FVX^N7*_R$Ms%gzHaDmRX7uFg-U(+@p|19IbCNW^ z5i{MgT1fia6%D*z-yQi*Z<;G)<&*^4>yhd{ooNtw(l!DhG|Den!PsT)QsL*_06SKIS9ikZ+!n7v}8^+H`Dv$^imNRgi5=k zG!AZ|bnz6LGn#^S`WZ#NYWm!KY3+?(vD(pGm1O|@;rYxey@WOfa4Uu64Ms$!^R_X& zHLW6zQh%i66R!iB_ZO|REP+g|=L)AxfA+7EC6>&eTz;w3NLsCQY%B$rv~vhp)M@Tav4ssDE>#8I z>2O0rBx9UQCz5x=kG@|W7!`QXJB5YxURB^M=g0nxuGN!;psc9gYf=76nKIpZI|fh%!1<<8`VRq3B*3YD)>1YT zgp^R!YXRo~76iGPv@z)Y>l1sac{A8hjvQ2Z0rPMQIa1$IOEvrJ!h&~EwS+qPS_%JW zPke0j#6S{qNl=HN*jr|FLdIv8=*|3aB6Ho=BiZLLrF1SQc-_~Z$l~PEiLOV$Slx<{ z+Ur}S^zj|Dfzy|2h)E~G5jfbFIRd7Fza%p{_oz*U<#<&Mnk*qYu#eT+~kBz8Rp1QHIjk(_}j>_t~fwy z=~72I0&w8%ZU$+1P9hI_=^%MZgQd3x%a${e2ebaQ^z%7Jdreu$bf3G4TS21bP2niq v4}m39aJ6A=rNfR1DDJ7~Gaxf+yLetVgPwN&a&lVqLG*PGSmHestjFD3lkUC` literal 1637 zcmV-r2AcVW0t^E@y8KTiHb4#m5CEOh973&1Z}VTGCu#d$BRsJ>Y(J_>1$Y@7`Z zBSasZG=58IYP5<~_!X-#H}fx){qf@mb0W4tr|n=SF_!xEI0DZRRQ7CETpr8V&$L%% zXE)h1@ds#N6q|?>ZF7wbH+)wH`LrN{`pXeaIdpL!4jqs6l%5dny01-l1R_M(L`x_f~MZa$pbCplm^NTNoh9yE`R8WOw9;pF*&#b(9&^I-B-dOv1TMQMb3J=4h z=+wmE6V)R&*sZh+R(AMj$uvNk;o6>L2*SS&l?}j17atD~cgwSjp%?NHA@BrN>2O=e znLX0)Uq1T77feYOo1O*XAC$>?5&feVej}QHu16d5v~t|Cs(MdCZkCufTsG=H@8C~! z+NrKLkGzM;(Yj&+1)aC40;SC{CWpKm3D31C-QSy#M#q}koh}GRBQl7JVK0Q9#k`B& z?UvogJmnk8P|)=(MdZPsM34+*w?{1U&C1A2VxaE=#gv>hO{P;9wH^KHXEbfmoXh0S zyjU`xkGN@)#Mu2PQw!4S0iETO^M}XLd}pCh(%iP@IpW5QZjoaFKv9$x!>fmD@%-oM z;ml4eEOQSAxS%W{sF&odC-Da*^3G&$D=GLAFkZF7WeHss@x@sj+tOD+Fo9KiAtJ7> z+1&WvFj||TbkcJzrFXKEmQbs_&J1YG^_f~hV3i>}8VluuHvSBXSVxKk6L6++qg7CM z==Xj~x&(`>;;#4&c;5xQQp*|aSPfxAdCJkR{|6H!Kh!STiM-V4s()eJ%I|e$12S6H z$5ejV;Lu?#d#iA2;Jii+ZWlPll24F)@v>2V2-jJ@z_*N2@=ML=0;@*UJF~{5Thiti z7cwub*TPbFot~Af;=o>b2I=L$NR+c%KwcqKKwl8TToT<9PN_8Vgo&{Rv>i8#VTU0f zTnOShd%SvRN++$%?o0`Hezia+8z`lDDZ)lEL>b42VE%ART?S3r_{}DCg2gU@<;RYy z;xOE4k*sIjQ+33#OL4^K6#^CV-b8oM@|1U!`MU*|a^gQ1P*Cp^Gt# zfbP4jEVTqcTA@bI+Ls8>cJCxY91Cja4o5V!9eVrw?Le^(&d-CyihlaBWA@ERH$;gm zX<;GRS@TBWmJ5yNVAc9y6tV|#H$@4t4Q0Hhr`Oa$l3>JHve4iF*r8MiD?CuaQ$lgz z?rCTP2XqvH<|D{0;VF04HBe5WjbtWSerT4PUcUqGkn6w8l>C46{VGiCL8H9~&S1OG zA!+?G!}tP#jNMbQa5^wfklzW1LqF6)gEgaqM}(ievLDhdf(mYKV-x z%G-}~<05^-9!eXeFHyzd121g?yfMvFTKuRB&f~9@Qyif+e zwLA~Ekz(C?LRTgn1Q@}V;=8}kGG!B9@R%20zT9TBZDM_m+2_zyiW8GugH3-0sxxPM z;4|Z=D(hZ9oIzLdWx_Y?9-1nL=M*fxkoHjPbWi}et_E3|uQ(E~=O$_2CjpQLU-V2I zE-IK>2_#3)+j;BymC_MM3WnuHxJ(FuxkV}6v zQ{6hj7E<-lv3P|&Tvu&q#n*f?{mI$1g7vy$bTzeX`mZz;e=b2oL-$amRAzw93qyLF jGLnB`)Yeg#-aNwEr|Gy8i(ysEe68P55N#gFLXP_lTb&{d diff --git a/host/lhr01nuc/spec.fcc b/host/lhr01nuc/spec.fcc index 689800b..73908fd 100644 --- a/host/lhr01nuc/spec.fcc +++ b/host/lhr01nuc/spec.fcc @@ -15,6 +15,7 @@ ignition: - local: service/rspamd/spec.ign - local: service/prosody/spec.ign - local: service/biboumi/spec.ign + - local: service/discord-ircd/spec.ign - local: service/radicale/spec.ign - local: private/spec.ign