diff --git a/root/etc/s6-overlay/s6-rc.d/init-lighttpd-config/run b/root/etc/s6-overlay/s6-rc.d/init-lighttpd-config/run index 6fcf953..fa06bea 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-lighttpd-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-lighttpd-config/run @@ -7,8 +7,17 @@ mkdir -p /config /app/www if [ ! -f /config/lighttpd.conf ]; then echo "Copy default lighttpd.conf ..." cp /defaults/lighttpd.conf /config/lighttpd.conf + echo "Copy default rsyncd.conf ..." + cp /defaults/rsyncd.conf /config/rsyncd.conf + echo "Copy default rsync-rules.txt ..." + cp /defaults/rsync-rules.txt /config/rsync-rules.txt + echo "Copy default stats ..." + cp /defaults/stats /etc/periodic/15min/stats + echo "Copy default alpine-mirror ..." + cp /defaults/alpine-mirror /etc/periodic/hourly/alpine-mirror fi + echo "Set permissions to PUID: ${PUID:-911} and PGID: ${PGID:-1000}" chown -R "${PUID:-911}:${PGID:-1000}" /config chown -R "${PUID:-911}:${PGID:-1000}" /app/www diff --git a/root/etc/s6-overlay/s6-rc.d/init-rsync-config/run b/root/etc/s6-overlay/s6-rc.d/init-rsync-config/run deleted file mode 100755 index 36f97aa..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-rsync-config/run +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/with-contenv bash - -echo "Start: init-rsync-config run script" - -mkdir -p /config /app/www - -if [ ! -f /config/rsyncd.conf ]; then - echo "Copy default rsyncd.conf ..." - cp /defaults/rsyncd.conf /config/rsyncd.conf -fi - -if [ ! -f /config/rsync-rules.txt ]; then - echo "Copy default rsync-rules.txt ..." - cp /defaults/rsync-rules.txt /config/rsync-rules.txt -fi - -echo "Set permissions to PUID: ${PUID:-911} and PGID: ${PGID:-1000}" -chown -R "${PUID:-911}:${PGID:-1000}" /config -chown -R "${PUID:-911}:${PGID:-1000}" /app/www - -echo "Finish: init-rsync-config" \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-rsync-config/type b/root/etc/s6-overlay/s6-rc.d/init-rsync-config/type deleted file mode 100644 index 3d92b15..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-rsync-config/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-rsync-config/up b/root/etc/s6-overlay/s6-rc.d/init-rsync-config/up deleted file mode 100644 index 6567c7a..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-rsync-config/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-rsync-config/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-vnstat-config/run b/root/etc/s6-overlay/s6-rc.d/init-vnstat-config/run deleted file mode 100755 index aaef058..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-vnstat-config/run +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/with-contenv bash - -echo "Start: init-vnstat-config run script" - -mkdir -p /config /app/www - -if [ ! -f /etc/periodic/15min/stats ]; then - echo "Copy default stats ..." - cp /defaults/stats /etc/periodic/15min/stats -fi - -if [ ! -f /etc/periodic/hourly/alpine-mirror ]; then - echo "Copy default alpine-mirror ..." - cp /defaults/alpine-mirror /etc/periodic/hourly/alpine-mirror -fi - -echo "Finish: init-vnstat-config" \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-vnstat-config/type b/root/etc/s6-overlay/s6-rc.d/init-vnstat-config/type deleted file mode 100644 index 3d92b15..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-vnstat-config/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-vnstat-config/up b/root/etc/s6-overlay/s6-rc.d/init-vnstat-config/up deleted file mode 100644 index 191a869..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-vnstat-config/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-vnstat-config/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies b/root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies index c62f52d..ae5f393 100644 --- a/root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies +++ b/root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies @@ -1 +1 @@ -init-rsync-config \ No newline at end of file +init-lighttpd-config \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-vnstat/dependencies b/root/etc/s6-overlay/s6-rc.d/svc-vnstat/dependencies index 33fd888..ae5f393 100644 --- a/root/etc/s6-overlay/s6-rc.d/svc-vnstat/dependencies +++ b/root/etc/s6-overlay/s6-rc.d/svc-vnstat/dependencies @@ -1 +1 @@ -init-vnstat-config \ No newline at end of file +init-lighttpd-config \ No newline at end of file