From aafa8d9f127a44a7099250862125e5b4d51d6a96 Mon Sep 17 00:00:00 2001 From: Alex Palaistras Date: Fri, 26 Mar 2021 20:47:08 +0000 Subject: [PATCH] Move systemd files to separate folders This will help make subsequent synchronization with hosts easier, as systemd files and potential dropins are guarnateed to exist under a certain hierarchy that can be dropped as-is into host configuration directories. --- config/common/container.fcc | 19 ++++--------------- .../container-build@.path | 0 .../container-build@.service | 0 .../container-environment@.service | 0 .../container-network@.service | 0 config/service/biboumi/spec.fcc | 7 +++---- .../biboumi/{ => systemd}/biboumi.service | 0 config/service/discord-ircd/spec.fcc | 7 +++---- .../{ => systemd}/discord-ircd.service | 0 config/service/dovecot/spec.fcc | 10 +++------- .../{ => systemd}/dovecot-firstboot.target | 0 .../dovecot/{ => systemd}/dovecot.service | 0 config/service/git/spec.fcc | 13 +++---------- .../{ => systemd}/git-ssh-ed25519@.service | 0 .../git/{ => systemd}/git-ssh-pubkey@.service | 0 config/service/git/{ => systemd}/git.service | 0 config/service/letsencrypt/spec.fcc | 13 +++---------- .../letsencrypt-dns-register@.service | 0 .../letsencrypt-dns-renew@.service | 0 .../letsencrypt-dns-renew@.timer | 0 config/service/mariadb/spec.fcc | 10 +++------- .../{ => systemd}/mariadb-migrate@.service | 0 .../mariadb/{ => systemd}/mariadb.service | 0 config/service/nginx/spec.fcc | 16 +++------------- .../{ => systemd}/nginx-ingress-http@.service | 0 .../nginx/{ => systemd}/nginx-ingress.service | 0 .../nginx/{ => systemd}/nginx-php@.service | 0 .../nginx/{ => systemd}/nginx-static@.service | 0 config/service/postfix/spec.fcc | 7 +++---- .../postfix/{ => systemd}/postfix.service | 0 config/service/prosody/spec.fcc | 10 +++------- .../{ => systemd}/prosody-firstboot.target | 0 .../prosody/{ => systemd}/prosody.service | 0 config/service/radicale/spec.fcc | 7 +++---- .../radicale/{ => systemd}/radicale.service | 0 config/service/redis/spec.fcc | 7 +++---- .../service/redis/{ => systemd}/redis.service | 0 config/service/rspamd/spec.fcc | 10 +++------- .../rspamd-dkim-generate@.service | 0 .../rspamd/{ => systemd}/rspamd.service | 0 40 files changed, 40 insertions(+), 96 deletions(-) rename config/common/{container => systemd}/container-build@.path (100%) rename config/common/{container => systemd}/container-build@.service (100%) rename config/common/{container => systemd}/container-environment@.service (100%) rename config/common/{container => systemd}/container-network@.service (100%) rename config/service/biboumi/{ => systemd}/biboumi.service (100%) rename config/service/discord-ircd/{ => systemd}/discord-ircd.service (100%) rename config/service/dovecot/{ => systemd}/dovecot-firstboot.target (100%) rename config/service/dovecot/{ => systemd}/dovecot.service (100%) rename config/service/git/{ => systemd}/git-ssh-ed25519@.service (100%) rename config/service/git/{ => systemd}/git-ssh-pubkey@.service (100%) rename config/service/git/{ => systemd}/git.service (100%) rename config/service/letsencrypt/{ => systemd}/letsencrypt-dns-register@.service (100%) rename config/service/letsencrypt/{ => systemd}/letsencrypt-dns-renew@.service (100%) rename config/service/letsencrypt/{ => systemd}/letsencrypt-dns-renew@.timer (100%) rename config/service/mariadb/{ => systemd}/mariadb-migrate@.service (100%) rename config/service/mariadb/{ => systemd}/mariadb.service (100%) rename config/service/nginx/{ => systemd}/nginx-ingress-http@.service (100%) rename config/service/nginx/{ => systemd}/nginx-ingress.service (100%) rename config/service/nginx/{ => systemd}/nginx-php@.service (100%) rename config/service/nginx/{ => systemd}/nginx-static@.service (100%) rename config/service/postfix/{ => systemd}/postfix.service (100%) rename config/service/prosody/{ => systemd}/prosody-firstboot.target (100%) rename config/service/prosody/{ => systemd}/prosody.service (100%) rename config/service/radicale/{ => systemd}/radicale.service (100%) rename config/service/redis/{ => systemd}/redis.service (100%) rename config/service/rspamd/{ => systemd}/rspamd-dkim-generate@.service (100%) rename config/service/rspamd/{ => systemd}/rspamd.service (100%) diff --git a/config/common/container.fcc b/config/common/container.fcc index 9483491..01693f7 100644 --- a/config/common/container.fcc +++ b/config/common/container.fcc @@ -1,22 +1,11 @@ variant: fcos version: 1.3.0 storage: - files: - - path: /etc/systemd/system/container-build@.service - contents: - local: common/container/container-build@.service - - path: /etc/systemd/system/container-build@.path - contents: - local: common/container/container-build@.path - - path: /etc/systemd/system/container-network@.service - contents: - local: common/container/container-network@.service - - path: /etc/systemd/system/container-environment@.service - contents: - local: common/container/container-environment@.service trees: - - local: service/ - path: /etc/container-service + - path: /etc/container-service + local: service/ + - path: /etc/systemd/system + local: common/systemd/ directories: - path: /etc/container-service mode: 0700 diff --git a/config/common/container/container-build@.path b/config/common/systemd/container-build@.path similarity index 100% rename from config/common/container/container-build@.path rename to config/common/systemd/container-build@.path diff --git a/config/common/container/container-build@.service b/config/common/systemd/container-build@.service similarity index 100% rename from config/common/container/container-build@.service rename to config/common/systemd/container-build@.service diff --git a/config/common/container/container-environment@.service b/config/common/systemd/container-environment@.service similarity index 100% rename from config/common/container/container-environment@.service rename to config/common/systemd/container-environment@.service diff --git a/config/common/container/container-network@.service b/config/common/systemd/container-network@.service similarity index 100% rename from config/common/container/container-network@.service rename to config/common/systemd/container-network@.service diff --git a/config/service/biboumi/spec.fcc b/config/service/biboumi/spec.fcc index 7505f0b..0109893 100644 --- a/config/service/biboumi/spec.fcc +++ b/config/service/biboumi/spec.fcc @@ -1,10 +1,9 @@ variant: fcos version: 1.3.0 storage: - files: - - path: /etc/systemd/system/biboumi.service - contents: - local: service/biboumi/biboumi.service + trees: + - path: /etc/systemd/system + local: service/biboumi/systemd/ systemd: units: - name: biboumi.service diff --git a/config/service/biboumi/biboumi.service b/config/service/biboumi/systemd/biboumi.service similarity index 100% rename from config/service/biboumi/biboumi.service rename to config/service/biboumi/systemd/biboumi.service diff --git a/config/service/discord-ircd/spec.fcc b/config/service/discord-ircd/spec.fcc index 4d8c3b3..58c2e30 100644 --- a/config/service/discord-ircd/spec.fcc +++ b/config/service/discord-ircd/spec.fcc @@ -1,10 +1,9 @@ variant: fcos version: 1.3.0 storage: - files: - - path: /etc/systemd/system/discord-ircd.service - contents: - local: service/discord-ircd/discord-ircd.service + trees: + - path: /etc/systemd/system + local: service/discord-ircd/systemd/ systemd: units: - name: discord-ircd.service diff --git a/config/service/discord-ircd/discord-ircd.service b/config/service/discord-ircd/systemd/discord-ircd.service similarity index 100% rename from config/service/discord-ircd/discord-ircd.service rename to config/service/discord-ircd/systemd/discord-ircd.service diff --git a/config/service/dovecot/spec.fcc b/config/service/dovecot/spec.fcc index 486fe5e..02e4a9a 100644 --- a/config/service/dovecot/spec.fcc +++ b/config/service/dovecot/spec.fcc @@ -1,13 +1,9 @@ variant: fcos version: 1.3.0 storage: - files: - - path: /etc/systemd/system/dovecot-firstboot.target - contents: - local: service/dovecot/dovecot-firstboot.target - - path: /etc/systemd/system/dovecot.service - contents: - local: service/dovecot/dovecot.service + trees: + - path: /etc/systemd/system + local: service/dovecot/systemd/ systemd: units: - name: dovecot-firstboot.target diff --git a/config/service/dovecot/dovecot-firstboot.target b/config/service/dovecot/systemd/dovecot-firstboot.target similarity index 100% rename from config/service/dovecot/dovecot-firstboot.target rename to config/service/dovecot/systemd/dovecot-firstboot.target diff --git a/config/service/dovecot/dovecot.service b/config/service/dovecot/systemd/dovecot.service similarity index 100% rename from config/service/dovecot/dovecot.service rename to config/service/dovecot/systemd/dovecot.service diff --git a/config/service/git/spec.fcc b/config/service/git/spec.fcc index afec6fe..78b3121 100644 --- a/config/service/git/spec.fcc +++ b/config/service/git/spec.fcc @@ -1,16 +1,9 @@ variant: fcos version: 1.3.0 storage: - files: - - path: /etc/systemd/system/git.service - contents: - local: service/git/git.service - - path: /etc/systemd/system/git-ssh-pubkey@.service - contents: - local: service/git/git-ssh-pubkey@.service - - path: /etc/systemd/system/git-ssh-ed25519@.service - contents: - local: service/git/git-ssh-ed25519@.service + trees: + - path: /etc/systemd/system + local: service/git/systemd/ systemd: units: - name: git.service diff --git a/config/service/git/git-ssh-ed25519@.service b/config/service/git/systemd/git-ssh-ed25519@.service similarity index 100% rename from config/service/git/git-ssh-ed25519@.service rename to config/service/git/systemd/git-ssh-ed25519@.service diff --git a/config/service/git/git-ssh-pubkey@.service b/config/service/git/systemd/git-ssh-pubkey@.service similarity index 100% rename from config/service/git/git-ssh-pubkey@.service rename to config/service/git/systemd/git-ssh-pubkey@.service diff --git a/config/service/git/git.service b/config/service/git/systemd/git.service similarity index 100% rename from config/service/git/git.service rename to config/service/git/systemd/git.service diff --git a/config/service/letsencrypt/spec.fcc b/config/service/letsencrypt/spec.fcc index 9a329ae..b2bcb1e 100644 --- a/config/service/letsencrypt/spec.fcc +++ b/config/service/letsencrypt/spec.fcc @@ -1,16 +1,9 @@ variant: fcos version: 1.3.0 storage: - files: - - path: /etc/systemd/system/letsencrypt-dns-register@.service - contents: - local: service/letsencrypt/letsencrypt-dns-register@.service - - path: /etc/systemd/system/letsencrypt-dns-renew@.service - contents: - local: service/letsencrypt/letsencrypt-dns-renew@.service - - path: /etc/systemd/system/letsencrypt-dns-renew@.timer - contents: - local: service/letsencrypt/letsencrypt-dns-renew@.timer + trees: + - path: /etc/systemd/system + local: service/letsencrypt/systemd/ systemd: units: - name: letsencrypt-dns-register@.service diff --git a/config/service/letsencrypt/letsencrypt-dns-register@.service b/config/service/letsencrypt/systemd/letsencrypt-dns-register@.service similarity index 100% rename from config/service/letsencrypt/letsencrypt-dns-register@.service rename to config/service/letsencrypt/systemd/letsencrypt-dns-register@.service diff --git a/config/service/letsencrypt/letsencrypt-dns-renew@.service b/config/service/letsencrypt/systemd/letsencrypt-dns-renew@.service similarity index 100% rename from config/service/letsencrypt/letsencrypt-dns-renew@.service rename to config/service/letsencrypt/systemd/letsencrypt-dns-renew@.service diff --git a/config/service/letsencrypt/letsencrypt-dns-renew@.timer b/config/service/letsencrypt/systemd/letsencrypt-dns-renew@.timer similarity index 100% rename from config/service/letsencrypt/letsencrypt-dns-renew@.timer rename to config/service/letsencrypt/systemd/letsencrypt-dns-renew@.timer diff --git a/config/service/mariadb/spec.fcc b/config/service/mariadb/spec.fcc index 6ebd054..b2a89e5 100644 --- a/config/service/mariadb/spec.fcc +++ b/config/service/mariadb/spec.fcc @@ -1,13 +1,9 @@ variant: fcos version: 1.3.0 storage: - files: - - path: /etc/systemd/system/mariadb.service - contents: - local: service/mariadb/mariadb.service - - path: /etc/systemd/system/mariadb-migrate@.service - contents: - local: service/mariadb/mariadb-migrate@.service + trees: + - path: /etc/systemd/system + local: service/mariadb/systemd/ systemd: units: - name: mariadb.service diff --git a/config/service/mariadb/mariadb-migrate@.service b/config/service/mariadb/systemd/mariadb-migrate@.service similarity index 100% rename from config/service/mariadb/mariadb-migrate@.service rename to config/service/mariadb/systemd/mariadb-migrate@.service diff --git a/config/service/mariadb/mariadb.service b/config/service/mariadb/systemd/mariadb.service similarity index 100% rename from config/service/mariadb/mariadb.service rename to config/service/mariadb/systemd/mariadb.service diff --git a/config/service/nginx/spec.fcc b/config/service/nginx/spec.fcc index 75b7665..e756c89 100644 --- a/config/service/nginx/spec.fcc +++ b/config/service/nginx/spec.fcc @@ -1,19 +1,9 @@ variant: fcos version: 1.3.0 storage: - files: - - path: /etc/systemd/system/nginx-ingress.service - contents: - local: service/nginx/nginx-ingress.service - - path: /etc/systemd/system/nginx-ingress-http@.service - contents: - local: service/nginx/nginx-ingress-http@.service - - path: /etc/systemd/system/nginx-static@.service - contents: - local: service/nginx/nginx-static@.service - - path: /etc/systemd/system/nginx-php@.service - contents: - local: service/nginx/nginx-php@.service + trees: + - path: /etc/systemd/system + local: service/nginx/systemd/ systemd: units: - name: nginx-ingress.service diff --git a/config/service/nginx/nginx-ingress-http@.service b/config/service/nginx/systemd/nginx-ingress-http@.service similarity index 100% rename from config/service/nginx/nginx-ingress-http@.service rename to config/service/nginx/systemd/nginx-ingress-http@.service diff --git a/config/service/nginx/nginx-ingress.service b/config/service/nginx/systemd/nginx-ingress.service similarity index 100% rename from config/service/nginx/nginx-ingress.service rename to config/service/nginx/systemd/nginx-ingress.service diff --git a/config/service/nginx/nginx-php@.service b/config/service/nginx/systemd/nginx-php@.service similarity index 100% rename from config/service/nginx/nginx-php@.service rename to config/service/nginx/systemd/nginx-php@.service diff --git a/config/service/nginx/nginx-static@.service b/config/service/nginx/systemd/nginx-static@.service similarity index 100% rename from config/service/nginx/nginx-static@.service rename to config/service/nginx/systemd/nginx-static@.service diff --git a/config/service/postfix/spec.fcc b/config/service/postfix/spec.fcc index 768079f..2d6788a 100644 --- a/config/service/postfix/spec.fcc +++ b/config/service/postfix/spec.fcc @@ -1,10 +1,9 @@ variant: fcos version: 1.3.0 storage: - files: - - path: /etc/systemd/system/postfix.service - contents: - local: service/postfix/postfix.service + trees: + - path: /etc/systemd/system + local: service/postfix/systemd/ systemd: units: - name: postfix.service diff --git a/config/service/postfix/postfix.service b/config/service/postfix/systemd/postfix.service similarity index 100% rename from config/service/postfix/postfix.service rename to config/service/postfix/systemd/postfix.service diff --git a/config/service/prosody/spec.fcc b/config/service/prosody/spec.fcc index c8a244a..e6ab55c 100644 --- a/config/service/prosody/spec.fcc +++ b/config/service/prosody/spec.fcc @@ -1,13 +1,9 @@ variant: fcos version: 1.3.0 storage: - files: - - path: /etc/systemd/system/prosody-firstboot.target - contents: - local: service/prosody/prosody-firstboot.target - - path: /etc/systemd/system/prosody.service - contents: - local: service/prosody/prosody.service + trees: + - path: /etc/systemd/system + local: service/prosody/systemd/ systemd: units: - name: prosody-firstboot.target diff --git a/config/service/prosody/prosody-firstboot.target b/config/service/prosody/systemd/prosody-firstboot.target similarity index 100% rename from config/service/prosody/prosody-firstboot.target rename to config/service/prosody/systemd/prosody-firstboot.target diff --git a/config/service/prosody/prosody.service b/config/service/prosody/systemd/prosody.service similarity index 100% rename from config/service/prosody/prosody.service rename to config/service/prosody/systemd/prosody.service diff --git a/config/service/radicale/spec.fcc b/config/service/radicale/spec.fcc index 0ac013a..a6d1057 100644 --- a/config/service/radicale/spec.fcc +++ b/config/service/radicale/spec.fcc @@ -1,10 +1,9 @@ variant: fcos version: 1.3.0 storage: - files: - - path: /etc/systemd/system/radicale.service - contents: - local: service/radicale/radicale.service + trees: + - path: /etc/systemd/system + local: service/radicale/systemd/ systemd: units: - name: radicale.service diff --git a/config/service/radicale/radicale.service b/config/service/radicale/systemd/radicale.service similarity index 100% rename from config/service/radicale/radicale.service rename to config/service/radicale/systemd/radicale.service diff --git a/config/service/redis/spec.fcc b/config/service/redis/spec.fcc index fe30655..3b37d2e 100644 --- a/config/service/redis/spec.fcc +++ b/config/service/redis/spec.fcc @@ -1,10 +1,9 @@ variant: fcos version: 1.3.0 storage: - files: - - path: /etc/systemd/system/redis.service - contents: - local: service/redis/redis.service + trees: + - path: /etc/systemd/system + local: service/redis/systemd/ systemd: units: - name: redis.service diff --git a/config/service/redis/redis.service b/config/service/redis/systemd/redis.service similarity index 100% rename from config/service/redis/redis.service rename to config/service/redis/systemd/redis.service diff --git a/config/service/rspamd/spec.fcc b/config/service/rspamd/spec.fcc index 23686cc..e1f59da 100644 --- a/config/service/rspamd/spec.fcc +++ b/config/service/rspamd/spec.fcc @@ -1,13 +1,9 @@ variant: fcos version: 1.3.0 storage: - files: - - path: /etc/systemd/system/rspamd.service - contents: - local: service/rspamd/rspamd.service - - path: /etc/systemd/system/rspamd-dkim-generate@.service - contents: - local: service/rspamd/rspamd-dkim-generate@.service + trees: + - path: /etc/systemd/system + local: service/rspamd/systemd/ systemd: units: - name: rspamd.service diff --git a/config/service/rspamd/rspamd-dkim-generate@.service b/config/service/rspamd/systemd/rspamd-dkim-generate@.service similarity index 100% rename from config/service/rspamd/rspamd-dkim-generate@.service rename to config/service/rspamd/systemd/rspamd-dkim-generate@.service diff --git a/config/service/rspamd/rspamd.service b/config/service/rspamd/systemd/rspamd.service similarity index 100% rename from config/service/rspamd/rspamd.service rename to config/service/rspamd/systemd/rspamd.service