diff --git a/.gitattributesdb b/.gitattributesdb index 3f1d9f2..1d4c025 100644 --- a/.gitattributesdb +++ b/.gitattributesdb @@ -122,10 +122,10 @@ Y3Jvbi5k - - ZXRjL2Nyb24uZC8uZ2l0aWdub3Jl 1774113745.435355910 1762535289.358058790 root:root 0644 - - ZXRj 1774881279.806906802 1771501908.000000000 root:root 0755 - - Y3Jvbi5kYWlseQ== - - -ZXRjL2Nyb24uZGFpbHkvLmdpdGlnbm9yZQ== 1762538383.748288196 1762535499.146684944 root:root 0644 - - +ZXRjL2Nyb24uZGFpbHkvLmdpdGlnbm9yZQ== 1774882375.073085385 1762535499.146684944 root:root 0644 - - ZXRj 1774881279.806906802 1771501908.000000000 root:root 0755 - - Y3Jvbi5kYWlseQ== - - -ZXRjL2Nyb24uZGFpbHkvMC1yb3RhdGUtbG9ncy1zeW1saW5rcw== 1773074830.431179720 1773074830.431179720 root:root 0777 - - +ZXRjL2Nyb24uZGFpbHkvMC1yb3RhdGUtbG9ncy10b2RheS1zeW1saW5r 1774882348.257522426 1774882348.257522426 root:root 0777 - - ZXRj 1774881279.806906802 1771501908.000000000 root:root 0755 - - Y3Jvbi5kYWlseQ== - - ZXRjL2Nyb24uZGFpbHkvMTAtZGVoeWRyYXRlZA== 1773074830.431179720 1773074830.431179720 root:root 0777 - - @@ -172,9 +172,6 @@ ZGVmYXVsdA== - - ZXRjL2RlZmF1bHQvcHJvbWV0aGV1cy1ub2RlLWV4cG9ydGVy 1773511187.568917165 1762023153.000000000 root:root 0644 - - ZXRj 1774881279.806906802 1771501908.000000000 root:root 0755 - - ZGVmYXVsdA== - - -ZXRjL2RlZmF1bHQvcm90YXRlLWxvZ3Mtc3ltbGlua3M= 1758555243.000000000 1758552192.000000000 root:root 0644 - - -ZXRj 1774881279.806906802 1771501908.000000000 root:root 0755 - - -ZGVmYXVsdA== - - ZXRjL2RlZmF1bHQvcnN5bmM= 1774115973.482452959 1764289744.000000000 root:root 0644 - - ZXRj 1774881279.806906802 1771501908.000000000 root:root 0755 - - ZGVmYXVsdA== - - @@ -233,6 +230,9 @@ ZG9rdXdpa2k= - - ZXRjL2Rva3V3aWtpL2Fjcm9ueW1zLmNvbmY= 1722839243.000000000 1773517662.000000000 root:www-data 0664 - - ZXRj 1774881279.806906802 1771501908.000000000 root:root 0755 - - ZG9rdXdpa2k= - - +ZXRjL2Rva3V3aWtpL2FwYWNoZS5jb25m 1774881241.459529288 1774881241.459529288 root:root 0644 - - +ZXRj 1774881279.806906802 1771501908.000000000 root:root 0755 - - +ZG9rdXdpa2k= - - ZXRjL2Rva3V3aWtpL2Rva3V3aWtpLnBocA== 1746154701.000000000 1773517662.000000000 root:www-data 0664 - - ZXRj 1774881279.806906802 1771501908.000000000 root:root 0755 - - ZG9rdXdpa2k= - - @@ -527,7 +527,7 @@ c2Jpbg== 1767688090.000000000 1767688090.000000000 root:root 0777 - - b3B0L3NiaW4vY3JvbmpvYi1kZWh5ZHJhdGVk 1758033093.000000000 1757531685.000000000 root:root 0755 - - b3B0 1771515169.961748163 1771501851.000000000 root:root 0755 - - c2Jpbg== 1767688090.000000000 1767688090.000000000 root:root 0777 - - -b3B0L3NiaW4vY3JvbmpvYi1yb3RhdGUtbG9ncy1zeW1saW5rcw== - - +b3B0L3NiaW4vY3JvbmpvYi1yb3RhdGUtbG9ncy10b2RheS1zeW1saW5r 1774882209.447784765 1774882209.447784765 root:root 0755 - - b3B0 1771515169.961748163 1771501851.000000000 root:root 0755 - - c2Jpbg== 1767688090.000000000 1767688090.000000000 root:root 0777 - - b3B0L3NiaW4vY3JvbmpvYi11cGRhdGUtcGFja2FnZXMtbGlzdA== 1773518953.705866964 1757531121.000000000 root:root 0755 - - diff --git a/etc/cron.daily/.gitignore b/etc/cron.daily/.gitignore index c77a4e1..c88ba48 100644 --- a/etc/cron.daily/.gitignore +++ b/etc/cron.daily/.gitignore @@ -1,6 +1,6 @@ /* !/.gitignore -!/0-rotate-logs-symlinks +!/0-rotate-logs-today-symlink !/5-update-packages-list !/7-warn-git-status !/10-dehydrated diff --git a/etc/cron.daily/0-rotate-logs-symlinks b/etc/cron.daily/0-rotate-logs-symlinks deleted file mode 120000 index e26953b..0000000 --- a/etc/cron.daily/0-rotate-logs-symlinks +++ /dev/null @@ -1 +0,0 @@ -/opt/sbin/cronjob-rotate-logs-symlinks \ No newline at end of file diff --git a/etc/cron.daily/0-rotate-logs-today-symlink b/etc/cron.daily/0-rotate-logs-today-symlink new file mode 120000 index 0000000..fbeaf76 --- /dev/null +++ b/etc/cron.daily/0-rotate-logs-today-symlink @@ -0,0 +1 @@ +/opt/sbin/cronjob-rotate-logs-today-symlink \ No newline at end of file diff --git a/etc/default/rotate-logs-symlinks b/etc/default/rotate-logs-symlinks deleted file mode 100644 index 2312951..0000000 --- a/etc/default/rotate-logs-symlinks +++ /dev/null @@ -1 +0,0 @@ -CREATE_DIRS['core.slackware.uk.net']="fusiondirectory samba" diff --git a/etc/dokuwiki/apache.conf b/etc/dokuwiki/apache.conf new file mode 100644 index 0000000..e69de29 diff --git a/opt/sbin/cronjob-rotate-logs-symlinks b/opt/sbin/cronjob-rotate-logs-symlinks deleted file mode 100755 index 49997ea..0000000 --- a/opt/sbin/cronjob-rotate-logs-symlinks +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -# Default configuration. -LOGS_DIR="/var/log" -DIR_MODE="0750" -UMASK="027" - -# This array may be used in the defaults file. -declare -A CREATE_DIRS - -# Allow /etc/default/rotate-logs-symlinks to override default configuration. -[[ -e /etc/default/rotate-logs-symlinks ]] && { - # shellcheck disable=SC1091 - source /etc/default/rotate-logs-symlinks || { - printf "%s: %s\\n" "${0##*/}" "failed reading /etc/default/rotate-logs-symlinks" >&2 - exit 1 - } -} - -# Process the directories in the logs directory. -[[ -d "$LOGS_DIR" ]] && { - TODAY="$(printf "%(%Y/%m/%d)T")" - - umask "$UMASK" - - # Process all the directories in the logs directory. - for DIR in "$LOGS_DIR"/*/; do - cd "$DIR" 2>/dev/null || { - printf "%s: %s\\n" "${0##*/}" "failed to change directory to '$DIR'" >&2 - continue - } - - # Create a new logs directory for today. - # shellcheck disable=SC2174 - mkdir -p -m "$DIR_MODE" "$TODAY" 2>/dev/null || { - printf "%s: %s\\n" "${0##*/}" "failed to create directory '$DIR/$TODAY'" >&2 - continue - } - - # If configured to do so for this directory, create sub directories. - for CREATE_DIR in ${CREATE_DIRS[$(printf "$DIR" | awk -F / -e '{print $4}')]}; do - mkdir -p -m "$DIR_MODE" "$TODAY/$CREATE_DIR" 2>/dev/null || { - printf "%s: %s\\n" "${0##*/}" "failed to create directory '$DIR/$TODAY/$CREATE_DIR'" >&2 - continue - } - done - - # Create a 'today' symlink to the new days' directory. - ( cd "$DIR" 2>/dev/null && ln -sfn "$TODAY" "today" 2>/dev/null ) || { - printf "%s: %s\\n" "${0##*/}" "updating 'today' symlink failed" >&2 - continue - } - done -} - -exit 0 diff --git a/opt/sbin/cronjob-rotate-logs-today-symlink b/opt/sbin/cronjob-rotate-logs-today-symlink new file mode 100755 index 0000000..cc0cfa2 --- /dev/null +++ b/opt/sbin/cronjob-rotate-logs-today-symlink @@ -0,0 +1,24 @@ +#!/bin/bash + +# Default configuration. +LOGS_DIR="/data/logs" + +# Process the directories in the $LOGS_DIR directory. +[[ -d "$LOGS_DIR" ]] && { + TODAY="$(printf "%(%Y/%m/%d)T")" + + for DIR in "$LOGS_DIR"/*/; do + cd "$DIR" 2>/dev/null || { + printf "%s: %s\\n" "${0##*/}" "failed to change directory to '$DIR'" >&2 + continue + } + + # Create the 'today' symlink to the new location.. + ln -sfn "$TODAY" "today" 2>/dev/null || { + printf "%s: %s\\n" "${0##*/}" "updating 'today' symlink failed in '$DIR'" >&2 + continue + } + done +} + +exit 0