diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get deleted file mode 100644 index 8e5fe66..0000000 --- a/root/etc/cont-init.d/95-apt-get +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/with-contenv bash - -if [ -f /usr/bin/apt ]; then - apt-get update -fi diff --git a/root/etc/cont-init.d/98-memories-dependency-install b/root/etc/cont-init.d/98-memories-dependency-install new file mode 100644 index 0000000..49f0eef --- /dev/null +++ b/root/etc/cont-init.d/98-memories-dependency-install @@ -0,0 +1,5 @@ +#!/usr/bin/with-contenv bash + +echo "**** Installing perl package ****" +apk add --no-cache \ + perl \ No newline at end of file diff --git a/root/etc/cont-init.d/98-vpn-config b/root/etc/cont-init.d/98-vpn-config deleted file mode 100644 index 98f2770..0000000 --- a/root/etc/cont-init.d/98-vpn-config +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/with-contenv bash - -# Determine if setup is needed -if [ ! -f /usr/local/lib/python***/dist-packages/sshuttle ] && \ -[ -f /usr/bin/apt ]; then - ## Ubuntu - apt-get install --no-install-recommends -y \ - iptables \ - openssh-client \ - python3 \ - python3-pip - pip3 install sshuttle -fi -if [ ! -f /usr/lib/python***/site-packages/sshuttle ] && \ -[ -f /sbin/apk ]; then - # Alpine - apk add --no-cache \ - iptables \ - openssh \ - py3-pip \ - python3 - pip3 install sshuttle -fi - -chown -R root:root /root -chmod -R 600 /root/.ssh diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-clientpush/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-memories-add-package/dependencies.d/init-mods similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-clientpush/dependencies.d/init-services rename to root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-memories-add-package/dependencies.d/init-mods diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-memories-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-memories-add-package/run new file mode 100755 index 0000000..70017a9 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-memories-add-package/run @@ -0,0 +1,10 @@ +#!/usr/bin/with-contenv bash + +perl_executable_path=$(which perl) +if [ -x "$perl_executable_path" ] ; then + echo "**** Adding perl5 and its deps to package install lists ****" + echo "perl\ + " >> /mod-repo-packages-to-install.list +else + echo "**** perl5 already installed, skipping ****" +fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-memories-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-memories-add-package/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-memories-add-package/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-memories-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-memories-add-package/up new file mode 100644 index 0000000..0fc3a3c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-memories-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-memories-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-nextcloud-clientpush b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-nextcloud-memories-add-package similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-nextcloud-clientpush rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-nextcloud-memories-add-package diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-clientpush/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-clientpush/run deleted file mode 100755 index d63d7eb..0000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-clientpush/run +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/with-contenv bash - -# This is an example service that would run for the mod -# It depends on init-services, the baseimage hook for start of all longrun services - -exec \ - s6-setuidgid abc /config/www/nextcloud/apps/notify_push/bin/x86_64/notify_push --nextcloud-url https://192.168.10.2:2443 --allow-self-signed --port 7867 /config/www/nextcloud/config/config.php diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-clientpush/type b/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-clientpush/type deleted file mode 100644 index 1780f9f..0000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-clientpush/type +++ /dev/null @@ -1 +0,0 @@ -longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-nextcloud-memories-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-nextcloud-memories-add-package new file mode 100644 index 0000000..e69de29