diff --git a/.gitignore b/.gitignore index 75e4321..921c956 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,7 @@ *.tar.gz *.tar /distrobuilder -CT-Files/nginx/nginx_signing.rsa.pub \ No newline at end of file +CT-Files/nginx/nginx_signing.rsa.pub +CT-Files/transfersh/transfersh-linux-amd64 +CT-Files/transfersh/transfershVersion +CT-Files/domoticz/domoticz.tgz \ No newline at end of file diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml index 5e2a34d..8218bf5 100644 --- a/CT-Build/Alpine.yaml +++ b/CT-Build/Alpine.yaml @@ -294,6 +294,13 @@ files: variants: - ddns +#FileForTransfersh +- path: /opt/Setup + generator: copy + source: CT-Files/transfersh + variants: + - transfersh + packages: manager: apk update: true @@ -337,6 +344,13 @@ packages: variants: - ddns + #PKGS for Transfersh + - packages: + - curl + action: install + variants: + - transfersh + repositories: - name: /etc/apk/repositories url: |- @@ -384,6 +398,7 @@ actions: - gitea - nginx - ddns + - transfersh mappings: architecture_map: alpinelinux diff --git a/CT-Files/domoticz/domoticz.tgz b/CT-Files/domoticz/domoticz.tgz deleted file mode 100644 index 5325193..0000000 Binary files a/CT-Files/domoticz/domoticz.tgz and /dev/null differ diff --git a/CT-Files/transfersh/Configs/transfersh.conf b/CT-Files/transfersh/Configs/transfersh.conf new file mode 100644 index 0000000..dc49d3f --- /dev/null +++ b/CT-Files/transfersh/Configs/transfersh.conf @@ -0,0 +1,5 @@ +LISTENER=:8080 +TEMP_PATH=/tmp +PROVIDER=local +BASEDIR=/opt/transfer.sh/store +#ForFutureDarkTheme#WEB_PATH=/opt/transfer.sh/CustomTheme \ No newline at end of file diff --git a/CT-Files/transfersh/Configs/transfersh.service b/CT-Files/transfersh/Configs/transfersh.service new file mode 100644 index 0000000..9c55d85 --- /dev/null +++ b/CT-Files/transfersh/Configs/transfersh.service @@ -0,0 +1,13 @@ +#!/sbin/openrc-run + +supervisor=supervise-daemon +name=transfersh +command="/opt/transfer.sh/transfersh-linux-amd64" +command_user="transfersh" +supervise_daemon_args="$(sed -e '/^#/d' -e 's/^/--env /' /opt/transfer.sh/transfersh.conf | xargs)" +pidfile="/run/gitea.pid" + +depend() { + use logger dns + need net +} \ No newline at end of file diff --git a/CT-Files/transfersh/Scripts/Init.sh b/CT-Files/transfersh/Scripts/Init.sh new file mode 100644 index 0000000..ab9a9eb --- /dev/null +++ b/CT-Files/transfersh/Scripts/Init.sh @@ -0,0 +1,16 @@ +#!/bin/ash +addgroup transfersh +adduser -S -s /bin/ash -h /home/transfersh -D -G transfersh transfersh +mkdir -p /opt/transfer.sh/CustomTheme +#Move files in place +#ForFutureDarkTheme#tar -C /opt/transfer.sh/CustomTheme -xzf /opt/Setup/CustomTheme.tar.gz +mv /opt/Setup/transfersh-linux-amd64 /opt/transfer.sh/transfersh-linux-amd64 +mv /opt/Setup/Configs/transfersh.conf /opt/transfer.sh/transfersh.conf +mv /opt/Setup/Configs/transfersh.service /etc/init.d/transfersh +mv /opt/Setup/transfershVersion /opt/transfer.sh/Version +#Setting permissions +chmod +x /etc/init.d/transfersh +chmod +x /opt/transfer.sh/transfersh-linux-amd64 +chown -R transfersh:transfersh /opt/transfer.sh +#Enable service +rc-update add transfersh \ No newline at end of file diff --git a/CT-Files/transfersh/Scripts/update.sh b/CT-Files/transfersh/Scripts/update.sh new file mode 100644 index 0000000..448981c --- /dev/null +++ b/CT-Files/transfersh/Scripts/update.sh @@ -0,0 +1,18 @@ +#!/bin/ash +. /opt/transfer.sh/Version + +CurtransfershVersion=$(curl -s https://api.github.com/repos/dutchcoders/transfer.sh/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ") + +if test "$CurtransfershVersion" = "$transfershVersion" ; then + echo 'Transfer.sh up-to-date' + exit +else + echo 'Updating Transfer.sh' + service transfersh stop + mv /opt/transfer.sh/transfersh-linux-amd64 /opt/transfer.sh/transfersh-linux-amd64.old + curl -L -o /opt/transfer.sh/transfersh-linux-amd64 https://github.com/dutchcoders/transfer.sh/releases/download/"$CurtransfershVersion"/transfersh-"$CurtransfershVersion"-linux-amd64 + chmod +x /opt/transfer.sh/transfersh-linux-amd64 + chown transfersh:transfersh /opt/transfer.sh/transfersh-linux-amd64 + echo "transfershVersion=$CurtransfershVersion" > /opt/transfer.sh/Version + service transfersh start +fi \ No newline at end of file diff --git a/Scripts/GetExternalResources.sh b/Scripts/GetExternalResources.sh index 329bc57..7a45053 100644 --- a/Scripts/GetExternalResources.sh +++ b/Scripts/GetExternalResources.sh @@ -10,8 +10,13 @@ GetResource () { curl -L --retry 7 --retry-delay 5 "$GetAddr" -o "CT-Files/$Variant/$FileName" } -#PhpMyadmin for mysql variant + GetResource mysql phpmyadmin.tar.gz https://www.phpmyadmin.net/downloads/phpMyAdmin-latest-english.tar.gz GetResource nginx nginx_signing.rsa.pub https://nginx.org/keys/nginx_signing.rsa.pub GetResource nginx acmesh.tar.gz https://codeload.github.com/acmesh-official/acme.sh/tar.gz/master -GetResource domoticz domoticz.tgz https://releases.domoticz.com/releases/release/domoticz_linux_x86_64.tgz \ No newline at end of file +GetResource domoticz domoticz.tgz https://releases.domoticz.com/releases/release/domoticz_linux_x86_64.tgz + +transfershVersion=$(curl -s https://api.github.com/repos/dutchcoders/transfer.sh/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ") +echo "transfershVersion=$transfershVersion" > CT-Files/transfersh/transfershVersion +GetResource transfersh transfersh-linux-amd64 https://github.com/dutchcoders/transfer.sh/releases/download/"$transfershVersion"/transfersh-"$transfershVersion"-linux-amd64 +#ForFutureDarkTheme#GetResource transfersh CustomTheme.tar.gz https://git.bprieshof.nl/attachments/e014dc2e-8b43-48bb-a771-da34e4d6fdef \ No newline at end of file