[taler-grid5k] 187/189: rename to be clearer

[gnunet]

This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository grid5k.

commit c7c161ae991122525a27daf2176572902bc1f374
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sun Apr 24 16:00:06 2022 +0200

    rename to be clearer
---
 .../lib/systemd/system/taler-data-backup.service   | 10 --------
 .../usr/lib/systemd/system/taler-data-backup.timer | 10 --------
 .../systemd/system/taler-prometheus-backup.service | 10 ++++++++
 .../systemd/system/taler-prometheus-backup.timer   | 10 ++++++++
 experiment/scripts/database.sh                     | 28 ++++++++++++++--------
 experiment/scripts/monitor.sh                      |  2 +-
 .../{data-backup.sh => prometheus-backup.sh}       |  0
 7 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/configs/usr/lib/systemd/system/taler-data-backup.service 
b/configs/usr/lib/systemd/system/taler-data-backup.service
deleted file mode 100644
index 304c9ab..0000000
--- a/configs/usr/lib/systemd/system/taler-data-backup.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Create periodic snapshots of the Prometheus and Loki data in the 
experiments
-Wants=taler-data-backup.service
-
-[Service]
-EnvironmentFile=/etc/environment
-ExecStart=/root/scripts/data-backup.sh
-
-[Install]
-WantedBy=multi-user.target
diff --git a/configs/usr/lib/systemd/system/taler-data-backup.timer 
b/configs/usr/lib/systemd/system/taler-data-backup.timer
deleted file mode 100644
index b49a4a1..0000000
--- a/configs/usr/lib/systemd/system/taler-data-backup.timer
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Create periodic snapshots of the Prometheus and Loki data in the 
experiments
-Requires=taler-data-backup.service
-
-[Timer]
-Unit=taler-data-backup.service
-OnCalendar=*:0/2
-
-[Install]
-WantedBy=timers.target
diff --git a/configs/usr/lib/systemd/system/taler-prometheus-backup.service 
b/configs/usr/lib/systemd/system/taler-prometheus-backup.service
new file mode 100644
index 0000000..8418b59
--- /dev/null
+++ b/configs/usr/lib/systemd/system/taler-prometheus-backup.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Create periodic snapshots of the Prometheus data in the experiments
+Wants=taler-prometheus-backup.timer
+
+[Service]
+EnvironmentFile=/etc/environment
+ExecStart=/root/scripts/prometheus-backup.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/configs/usr/lib/systemd/system/taler-prometheus-backup.timer 
b/configs/usr/lib/systemd/system/taler-prometheus-backup.timer
new file mode 100644
index 0000000..39607b2
--- /dev/null
+++ b/configs/usr/lib/systemd/system/taler-prometheus-backup.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Create periodic snapshots of the Prometheus data in the experiments
+Requires=taler-prometheus-backup.service
+
+[Timer]
+Unit=taler-prometheus-backup.service
+OnCalendar=*:0/2
+
+[Install]
+WantedBy=timers.target
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index 47761fd..736efb9 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -17,17 +17,25 @@ cd /tmp
 # Don't use in combination with `setup_ram_storage`
 function setup_disks() {
   if [ -b /dev/disk1 ]; then
-    echo 'start=2048, type=83' | sfdisk /dev/disk1 || true
-    yes | mkfs.ext4 -m 0 /dev/disk1 || true
-    mkdir /mnt/disk || true
-    mount /dev/disk1 /mnt/disk || true
-    if [ ! -L /tmp/postgresql/${POSTGRES_VERSION}/main/pg_wal ]; then
-      rm -rf /mnt/disk/pg_wal || true
-      mv /tmp/postgresql/${POSTGRES_VERSION}/main/pg_wal/ /mnt/disk
-      ln -s /mnt/disk/pg_wal /tmp/postgresql/${POSTGRES_VERSION}/main/pg_wal
-      chown -R postgres:postgres 
/tmp/postgresql/${POSTGRES_VERSION}/main/pg_wal
-    fi
+    # Dahu ssd
+    DISK=/dev/disk1
+  elif [ -b /dev/disk4 ]; then
+    # Yeti nvme
+    DISK=/dev/disk4
+  else
+    return
   fi
+  echo 'start=2048, type=83' | sfdisk ${DISK} || true
+  yes | mkfs.ext4 -m 0 ${DISK} || true
+  mkdir /mnt/disk || true
+  mount ${DISK} /mnt/disk || true
+  if [ ! -L /tmp/postgresql/${POSTGRES_VERSION}/main/pg_wal ]; then
+    rm -rf /mnt/disk/pg_wal || true
+    mv /tmp/postgresql/${POSTGRES_VERSION}/main/pg_wal/ /mnt/disk
+    ln -s /mnt/disk/pg_wal /tmp/postgresql/${POSTGRES_VERSION}/main/pg_wal
+    chown -R postgres:postgres /tmp/postgresql/${POSTGRES_VERSION}/main/pg_wal
+  fi
+  
 }
 
 # Setup Postgres to use RAM instead of disks to store data
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index 7c62e75..94a21db 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -247,7 +247,7 @@ function init_monitor() {
 
   systemctl restart prometheus-postgres-exporter \
                     prometheus \
-                   taler-data-backup.timer
+                   taler-prometheus-backup.timer
 
   exit 0
 }
diff --git a/experiment/scripts/data-backup.sh 
b/experiment/scripts/prometheus-backup.sh
similarity index 100%
rename from experiment/scripts/data-backup.sh
rename to experiment/scripts/prometheus-backup.sh

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.