wip

bundles/picsort/files/picsort.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+#exit 0
+export LANGUAGE=en_US.UTF-8
+export LANG=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+
+function log {
+  logger -st nc-picsort "${*:-$(</dev/stdin)}"
+}
+
+SOURCEPATH="/var/lib/nextcloud/ckn/files/SofortUpload/AutoSort/"
+DESTINATIONPATH="/var/lib/nextcloud/ckn/files/Bilder/Chronologie/"
+USER="ckn"
+
+log "STARTING..."
+
+if ps aux | grep cron | grep nc-picsort | grep -v $$; then log "EXIT: still running"; exit 0; fi
+
+SCAN="FALSE"
+IFS=$'\n'
+for f in `find "$SOURCEPATH" -iname *.PNG -o -iname *.JPG -o -iname *.CR2 -o -iname *.CR3 -o -iname *.MP4 -o -iname *.MOV`; do
+  log "PROCESSING: $f"
+  DATE=`exiftool "$f" | grep -m 1 "Create Date"`
+  if ! echo "$DATE" | grep "Create Date" >/dev/null
+  then
+    log "SKIP: no 'Create Date' in exif ($f)"
+    continue
+  fi
+  SCAN="TRUE"
+  YEAR=`echo $DATE | cut -d':' -f2 | cut -c 2-`
+  MONTH=`echo $DATE | cut -d':' -f3`
+  DAY=`echo $DATE | cut -d':' -f4 | cut -d' ' -f1`
+  HOUR=`echo $DATE | cut -d':' -f4 | cut -d' ' -f2`
+  MINUTE=`echo $DATE | cut -d':' -f5`
+  SECOND=`echo $DATE | cut -d':' -f6`
+  HASH=`sha256sum "$f" | xxd -r -p | base64 | head -c 3 | tr '/+' '_-'`
+  EXT=`echo "${f##*.}" | tr '[:upper:]' '[:lower:]'`
+  if [[ "$EXT" = "cr2" ]] ||  [[ "$EXT" = "cr3" ]]
+  then
+    RAW="raw/"
+  else
+    RAW=""
+  fi
+  FILE="$DESTINATIONPATH$YEAR-$MONTH/$RAW$YEAR$MONTH$DAY"-"$HOUR$MINUTE$SECOND"_"$HASH"."$EXT"
+  log "DESTINATION: $FILE"
+  mkdir -p "$(dirname "$FILE")"
+  mv -v "$f" "$FILE"
+done
+
+if [ "$SCAN" == "TRUE" ]; then
+  log "SCANNING..."
+  # find "$SOURCEPATH/"* -type d -empty -delete >> /var/log/nc-picsort.log # nextcloud app bug when deleting folders
+  chown -R www-data:www-data "$DESTINATIONPATH"
+  chmod -R 777 "$DESTINATIONPATH"
+  sudo -u www-data php /var/www/nextcloud/occ files:scan $USER | log
+  sudo -u www-data php /var/www/nextcloud/occ preview:generate-all $USER | log
+fi
+
+log "FINISH."

bundles/systemd-timers/items.py

@@ -1,3 +1,7 @@
+# svc_systemd['cron'] = {
+#     'enabled': False,
+# }
+
 for name, config in node.metadata.get('systemd-timers').items():
     files[f'/etc/systemd/system/{name}.timer'] = {
         'content': repo.libs.systemd.generate_unitfile({
@@ -6,6 +10,7 @@ for name, config in node.metadata.get('systemd-timers').items():
             },
             'Timer': {
                 'OnCalendar': config['when'],
+                'Persistent': config.get('persistent', False),
                 'Unit': f'{name}.service',
             },
             'Install': {

bundles/zfs/items.py

@@ -1,6 +1,15 @@
 from json import dumps
 from bundlewrap.metadata import MetadataJSONEncoder
 
+files = {
+    '/etc/cron.d/zfsutils-linux': {'delete': True},
+    '/etc/cron.d/zfs-auto-snapshot': {'delete': True},
+    '/etc/cron.hourly/zfs-auto-snapshot': {'delete': True},
+    '/etc/cron.daily/zfs-auto-snapshot': {'delete': True},
+    '/etc/cron.weekly/zfs-auto-snapshot': {'delete': True},
+    '/etc/cron.monthly/zfs-auto-snapshot': {'delete': True},
+}
+
 actions = {
     'modprobe_zfs': {
         'command': 'modprobe zfs',

bundles/zfs/metadata.py

@@ -38,6 +38,36 @@ defaults = {
             },
         },
     },
+    'systemd-timers': {
+        'zfs-trim': {
+            'command': '/usr/lib/zfs-linux/trim',
+            'when': 'Sat 00:00',
+            'persistent': True,
+        },
+        'zfs-scrub': {
+            'command': '/usr/lib/zfs-linux/scrub',
+            'when': 'Sun 00:00',
+            'persistent': True,
+        },
+        'zfs-auto-snapshot-hourly': {
+            'command': '/usr/sbin/zfs-auto-snapshot --quiet --syslog --label=hourly --keep=24 //',
+            'when': 'hourly',
+        },
+        'zfs-auto-snapshot-daily': {
+            'command': '/usr/sbin/zfs-auto-snapshot --quiet --syslog --label=daily --keep=7 //',
+            'when': 'daily',
+        },
+        'zfs-auto-snapshot-weekly': {
+            'command': '/usr/sbin/zfs-auto-snapshot --quiet --syslog --label=weekly --keep=4 //',
+            'when': 'weekly',
+            'persistent': True,
+        },
+        'zfs-auto-snapshot-monthly': {
+            'command': '/usr/sbin/zfs-auto-snapshot --quiet --syslog --label=monthly --keep=24 //',
+            'when': 'monthly',
+            'persistent': True,
+        },
+    },
     'telegraf': {
         'config': {
             'inputs': {