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

@@ -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

config/service/biboumi/spec.fcc

@@ -1,10 +1,9 @@
 variant: fcos
 version: 1.3.0
 storage:
-  files:
+  trees:
-    - path: /etc/systemd/system/biboumi.service
+    - path: /etc/systemd/system
-      contents:
+      local: service/biboumi/systemd/
-        local: service/biboumi/biboumi.service
 systemd:
   units:
     - name: biboumi.service

config/service/discord-ircd/spec.fcc

@@ -1,10 +1,9 @@
 variant: fcos
 version: 1.3.0
 storage:
-  files:
+  trees:
-    - path: /etc/systemd/system/discord-ircd.service
+    - path: /etc/systemd/system
-      contents:
+      local: service/discord-ircd/systemd/
-        local: service/discord-ircd/discord-ircd.service
 systemd:
   units:
     - name: discord-ircd.service

config/service/dovecot/spec.fcc

@@ -1,13 +1,9 @@
 variant: fcos
 version: 1.3.0
 storage:
-  files:
+  trees:
-    - path: /etc/systemd/system/dovecot-firstboot.target
+    - path: /etc/systemd/system
-      contents:
+      local: service/dovecot/systemd/
-        local: service/dovecot/dovecot-firstboot.target
-    - path: /etc/systemd/system/dovecot.service
-      contents:
-        local: service/dovecot/dovecot.service
 systemd:
   units:
     - name: dovecot-firstboot.target

config/service/git/spec.fcc

@@ -1,16 +1,9 @@
 variant: fcos
 version: 1.3.0
 storage:
-  files:
+  trees:
-    - path: /etc/systemd/system/git.service
+    - path: /etc/systemd/system
-      contents:
+      local: service/git/systemd/
-        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
 systemd:
   units:
     - name: git.service

config/service/letsencrypt/spec.fcc

@@ -1,16 +1,9 @@
 variant: fcos
 version: 1.3.0
 storage:
-  files:
+  trees:
-    - path: /etc/systemd/system/letsencrypt-dns-register@.service
+    - path: /etc/systemd/system
-      contents:
+      local: service/letsencrypt/systemd/
-        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
 systemd:
   units:
     - name: letsencrypt-dns-register@.service

config/service/mariadb/spec.fcc

@@ -1,13 +1,9 @@
 variant: fcos
 version: 1.3.0
 storage:
-  files:
+  trees:
-    - path: /etc/systemd/system/mariadb.service
+    - path: /etc/systemd/system
-      contents:
+      local: service/mariadb/systemd/
-        local: service/mariadb/mariadb.service
-    - path: /etc/systemd/system/mariadb-migrate@.service
-      contents:
-        local: service/mariadb/mariadb-migrate@.service
 systemd:
   units:
     - name: mariadb.service

config/service/nginx/spec.fcc

@@ -1,19 +1,9 @@
 variant: fcos
 version: 1.3.0
 storage:
-  files:
+  trees:
-    - path: /etc/systemd/system/nginx-ingress.service
+    - path: /etc/systemd/system
-      contents:
+      local: service/nginx/systemd/
-        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
 systemd:
   units:
     - name: nginx-ingress.service

config/service/postfix/spec.fcc

@@ -1,10 +1,9 @@
 variant: fcos
 version: 1.3.0
 storage:
-  files:
+  trees:
-    - path: /etc/systemd/system/postfix.service
+    - path: /etc/systemd/system
-      contents:
+      local: service/postfix/systemd/
-        local: service/postfix/postfix.service
 systemd:
   units:
     - name: postfix.service

config/service/prosody/spec.fcc

@@ -1,13 +1,9 @@
 variant: fcos
 version: 1.3.0
 storage:
-  files:
+  trees:
-    - path: /etc/systemd/system/prosody-firstboot.target
+    - path: /etc/systemd/system
-      contents:
+      local: service/prosody/systemd/
-        local: service/prosody/prosody-firstboot.target
-    - path: /etc/systemd/system/prosody.service
-      contents:
-        local: service/prosody/prosody.service
 systemd:
   units:
     - name: prosody-firstboot.target

config/service/radicale/spec.fcc

@@ -1,10 +1,9 @@
 variant: fcos
 version: 1.3.0
 storage:
-  files:
+  trees:
-    - path: /etc/systemd/system/radicale.service
+    - path: /etc/systemd/system
-      contents:
+      local: service/radicale/systemd/
-        local: service/radicale/radicale.service
 systemd:
   units:
     - name: radicale.service

config/service/redis/spec.fcc

@@ -1,10 +1,9 @@
 variant: fcos
 version: 1.3.0
 storage:
-  files:
+  trees:
-    - path: /etc/systemd/system/redis.service
+    - path: /etc/systemd/system
-      contents:
+      local: service/redis/systemd/
-        local: service/redis/redis.service
 systemd:
   units:
     - name: redis.service

config/service/rspamd/spec.fcc

@@ -1,13 +1,9 @@
 variant: fcos
 version: 1.3.0
 storage:
-  files:
+  trees:
-    - path: /etc/systemd/system/rspamd.service
+    - path: /etc/systemd/system
-      contents:
+      local: service/rspamd/systemd/
-        local: service/rspamd/rspamd.service
-    - path: /etc/systemd/system/rspamd-dkim-generate@.service
-      contents:
-        local: service/rspamd/rspamd-dkim-generate@.service
 systemd:
   units:
     - name: rspamd.service