roles/float-base-backup-metadata/handlers/main.yml

@@ -2,5 +2,5 @@
 
 - name: restart tabacco-metadb
   systemd:
-    name: tabacco-metadb.service
+    name: docker-backup-metadata-http.service
     state: restarted

roles/float-base-backup-metadata/tasks/main.yml

 ---
 
-# The tabacco package and /etc/tabacco directory have already been set
-# up by the "base" role.
-
-# The metadata server runs as its own dedicated user, it needs no
-# special privileges.
-
-- name: Create backup metadata user
-  user:
-    name: backup-metadata
-    groups: tabacco,backup-metadata-credentials
-    system: yes
-    state: present
-
-- name: Create backup metadata server database dir
-  file:
-    path: /var/lib/tabacco-metadb
-    state: directory
-    owner: backup-metadata
-    mode: 0700
-
 - name: Configure the backup metadata server
   template:
     src: metadb.yml.j2
@@ -27,16 +7,15 @@
   notify:
     - restart tabacco-metadb
 
-- name: Setup the backup-metadata systemd unit
-  template:
-    src: metadb.service.j2
-    dest: /etc/systemd/system/tabacco-metadb.service
-  notify:
-    - restart tabacco-metadb
-
-- name: Enable the backup metadata server
+# Remove legacy systemd service.
+- name: Disable the legacy backup metadata server systemd unit
   systemd:
     name: tabacco-metadb.service
     masked: no
-    enabled: yes
-    daemon_reload: yes
+    enabled: no
+  ignore_errors: true
+
+- name: Remove legacy backup metadata server systemd unit
+  file:
+    path: "/etc/systemd/system/tabacco-metadb.service"
+    state: absent

roles/float-base-backup-metadata/templates/metadb.service.j2

-[Unit]
-Description=Backup Agent
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/tabacco metadb
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-failure
-User=backup-metadata
-NoNewPrivileges=true
-
-[Install]
-WantedBy=multi-user.target

services.yml.default

@@ -310,6 +310,13 @@ backup-metadata:
   service_credentials:
     - name: backup-metadata
       enable_client: false
+  containers:
+    - name: http
+      image: registry.git.autistici.org/ai3/tools/tabacco:master
+      port: 5332
+      volumes:
+        - /etc/tabacco/metadb.yml: /etc/tabacco/metadb.yml
+        - /var/lib/tabacco-metadb: /var/lib/tabacco-metadb
   monitoring_endpoints:
     - job_name: backup-metadata
       port: 5332
@@ -319,10 +326,10 @@ backup-metadata:
       port: 5332
       scheme: https
       enable_sso_proxy: true
-  ports:
-    - 5332
-  systemd_services:
-    - tabacco-metadb.service
+  datasets:
+    - name: db
+      path: /var/lib/tabacco-metadb
+      owner: docker-backup-metadata
 
 acme:
   num_instances: 1

services.yml.no-elasticsearch

@@ -238,6 +238,13 @@ backup-metadata:
   service_credentials:
     - name: backup-metadata
       enable_client: false
+  containers:
+    - name: http
+      image: registry.git.autistici.org/ai3/tools/tabacco:master
+      port: 5332
+      volumes:
+        - /etc/tabacco/metadb.yml: /etc/tabacco/metadb.yml
+        - /var/lib/tabacco-metadb: /var/lib/tabacco-metadb
   monitoring_endpoints:
     - job_name: backup-metadata
       port: 5332
@@ -247,10 +254,10 @@ backup-metadata:
       port: 5332
       scheme: https
       enable_sso_proxy: true
-  ports:
-    - 5332
-  systemd_services:
-    - tabacco-metadb.service
+  datasets:
+    - name: db
+      path: /var/lib/tabacco-metadb
+      owner: docker-backup-metadata
 
 acme:
   num_instances: 1