From 0e756f37c0f1d46c014ec1564a3a46b24cd8c86b Mon Sep 17 00:00:00 2001
From: psy <psy@darmstadt.ccc.de>
Date: Sun, 31 Jan 2021 13:43:29 +0100
Subject: [PATCH] move config to config file
---
templates/hedgedoc-retention-cron.cfg.j2 | 6 ++++++
templates/hedgedoc-retention-cron.sh.j2 | 20 +++++++++++++-------
2 files changed, 19 insertions(+), 7 deletions(-)
create mode 100644 templates/hedgedoc-retention-cron.cfg.j2
diff --git a/templates/hedgedoc-retention-cron.cfg.j2 b/templates/hedgedoc-retention-cron.cfg.j2
new file mode 100644
index 0000000..e4a584e
--- /dev/null
+++ b/templates/hedgedoc-retention-cron.cfg.j2
@@ -0,0 +1,6 @@
+RETENTION_DAYS={{ hedgedoc.retention_cron.retention_days }}
+MAIL_ENABLED={{ hedgedoc.retention_cron.mail.enabled|bool|lower }}
+MAIL_TEMPLATE="{{ hedgedoc.retention_cron.mail.template }}"
+BACKUP_ENABLED={{ hedgedoc.retention_cron.backup.enabled|bool|lower }}
+BACKUP_PATH="{{ hedgedoc.retention_cron.backup.path }}"
+BACKUP_KEEP_DAYS={{ hedgedoc.retention_cron.backup.keep_days }}
\ No newline at end of file
diff --git a/templates/hedgedoc-retention-cron.sh.j2 b/templates/hedgedoc-retention-cron.sh.j2
index 31ee261..108dab6 100644
--- a/templates/hedgedoc-retention-cron.sh.j2
+++ b/templates/hedgedoc-retention-cron.sh.j2
@@ -2,12 +2,18 @@
PATH=$PATH:/usr/local/bin:/usr/sbin
-RETENTION_DAYS={{ hedgedoc.retention_cron.retention_days }}
-MAIL_ENABLED={{ hedgedoc.retention_cron.mail.enabled|bool|lower }}
-MAIL_TEMPLATE="{{ hedgedoc.retention_cron.mail.template }}"
-BACKUP_ENABLED={{ hedgedoc.retention_cron.backup.enabled|bool|lower }}
-BACKUP_PATH="{{ hedgedoc.retention_cron.backup.path }}"
-BACKUP_KEEP_DAYS={{ hedgedoc.retention_cron.backup.keep_days }}
+# default values
+RETENTION_DAYS=30
+MAIL_ENABLED=false
+MAIL_TEMPLATE=/usr/local/etc/hedgedoc-util/mail.tpl
+BACKUP_ENABLED=true
+BACKUP_PATH=/backup/hedgedoc/
+BACKUP_KEEP_DAYS=60
+
+# override default values if config exists
+if test -f /usr/local/etc/hedgedoc-util/hedgedoc-retention-cron.cfg; then
+ . /usr/local/etc/hedgedoc-util/hedgedoc-retention-cron.cfg
+fi
logger -t hedgedoc-util "Running retention cron script"
@@ -21,7 +27,7 @@ while read -r pad owner; do
logger -t hedgedoc-util "Processing pad $pad";
if [ "$BACKUP_ENABLED" = true ]; then
- hedgedoc-util pad get-content $pad > $BACKUP_PATH/$pad.md && logger -t hedgedoc-util "backup successfull"
+ hedgedoc-util pad get-content $pad > $BACKUP_PATH/$(date +"%Y%m%d")_$pad.md && logger -t hedgedoc-util "backup successfull"
fi
if [ "$MAIL_ENABLED" = true ]; then
--
GitLab