diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml index 5766eb0..e541c26 100644 --- a/CT-Build/Debian.yaml +++ b/CT-Build/Debian.yaml @@ -1377,6 +1377,15 @@ packages: - collabora #jellyfin pkgs + - packages: + - libjemalloc2 + action: install + early: true + variants: + - jellyfin + + +#jellyfin pkgs (part2) - packages: - jellyfin action: install @@ -1430,7 +1439,7 @@ packages: - cron - avahi-daemon - avahi-utils - - wsdd + - wsdd2 action: install variants: - smb @@ -1495,31 +1504,7 @@ packages: #Duplicati pkgs - packages: - - unzip - - libsqlite3-0 - - mono-devel - ## netstandard.dll is newer versions of duplicatie and only incuded in mono-devel, wich satisfy all other mono dependencies,exept libmono-2.0-1 - #- mono-runtime - #- ca-certificates-mono - - libmono-2.0-1 - #- libmono-system-configuration-install4.0-cil - #- libmono-system-core4.0-cil - #- libmono-system-configuration4.0-cil - #- libmono-system-data4.0-cil - #- libmono-system-drawing4.0-cil - #- libmono-system-net4.0-cil - #- libmono-system-net-http4.0-cil - #- libmono-system-net-http-webrequest4.0-cil - #- libmono-system-numerics4.0-cil - #- libmono-system-runtime-serialization4.0-cil - #- libmono-system-servicemodel4.0a-cil - #- libmono-system-servicemodel-discovery4.0-cil - #- libmono-system-serviceprocess4.0-cil - #- libmono-system-transactions4.0-cil - #- libmono-system-web4.0-cil - #- libmono-system-web-services4.0-cil - #- libmono-system-xml4.0-cil - #- libmono-microsoft-csharp4.0-cil + - libicu76 action: install variants: - duplicati diff --git a/CT-Files/duplicati/Configs/Duplicati-env b/CT-Files/duplicati/Configs/Duplicati-env index cbdc6f2..dfe3afb 100644 --- a/CT-Files/duplicati/Configs/Duplicati-env +++ b/CT-Files/duplicati/Configs/Duplicati-env @@ -2,3 +2,4 @@ # Additional options that are passed to the Daemon. DAEMON_OPTS="--webservice-interface=any --accept-any-ssl-certificate" +USAGEREPORTER_Duplicati_LEVEL=none diff --git a/CT-Files/duplicati/Configs/duplicati.service b/CT-Files/duplicati/Configs/duplicati.service deleted file mode 100644 index e0e1e0a..0000000 --- a/CT-Files/duplicati/Configs/duplicati.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Duplicati web-server -After=network.target - -[Service] -Nice=19 -IOSchedulingClass=idle -EnvironmentFile=-/etc/default/duplicati -ExecStart=/usr/bin/mono /opt/duplicati/Duplicati.Server.exe $DAEMON_OPTS -Restart=always - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/CT-Files/duplicati/Scripts/FirstRun.sh b/CT-Files/duplicati/Scripts/FirstRun.sh new file mode 100644 index 0000000..d286ad0 --- /dev/null +++ b/CT-Files/duplicati/Scripts/FirstRun.sh @@ -0,0 +1,6 @@ +#!/bin/bash +duplicati-server-util --server-datafolder /var/lib/Duplicati change-password +systemctl stop duplicati +echo "SETTINGS_ENCRYPTION_KEY=\"$(openssl rand -hex 32)\"" >> /etc/default/duplicati +systemctl daemon-reload +systemctl start duplicati diff --git a/CT-Files/duplicati/Scripts/Init.sh b/CT-Files/duplicati/Scripts/Init.sh index 368ed9a..e40f532 100644 --- a/CT-Files/duplicati/Scripts/Init.sh +++ b/CT-Files/duplicati/Scripts/Init.sh @@ -1,25 +1,19 @@ #!/bin/bash -#Get Resources -##Duplicate get latest (Working with mono-devel ) -CurrentVersion=$(curl -s https://api.github.com/repos/duplicati/duplicati/releases | grep 'tag_name.*' | grep 'beta' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " " |tr -d : |head -n 1) -##Duplicati get older version (Working with only the runtime installed) -#CurrentVersion="v2.0.5.1-2.0.5.1_beta_2020-01-18" -echo $CurrentVersion > /opt/Duplicati-installed -curl -L --retry 7 --retry-delay 5 $(curl -s https://api.github.com/repos/duplicati/duplicati/releases/tags/"$CurrentVersion" | grep browser_download_url | grep .zip |grep -v signatures | sed -e s#^.*https#https# | tr -d \") -o /opt/Setup/duplicati.zip || exit 1 +#Get Resources +##Stable release (Does not support debian 13 du tue libICU) +#CurrentVersion=$(curl -s https://api.github.com/repos/duplicati/duplicati/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " " |tr -d :) +##Beta version +CurrentVersion=$(curl -s https://api.github.com/repos/duplicati/duplicati/releases | grep 'tag_name.*' | grep 'beta' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " " |tr -d : |head -n 1) + +curl -L --retry 7 --retry-delay 5 "https://github.com/duplicati/duplicati/releases/download/$CurrentVersion/duplicati-${CurrentVersion:1}-linux-x64-cli.deb" -o /opt/Setup/duplicati.deb || exit 1 #Extract duplicati -unzip /opt/Setup/duplicati.zip -d /opt/duplicati +apt install -y /opt/Setup/duplicati.deb #Remove Archive -rm /opt/Setup/duplicati.zip +rm /opt/Setup/duplicati.deb #Install updates-cript mv /opt/Setup/Scripts/UpdateDuplicati.sh /opt/UpdateDuplicati.sh #Move configuration inplace -mv /opt/Setup/duplicati-installed /opt/Duplicati-installed mv /opt/Setup/Configs/Duplicati-env /etc/default/duplicati -#Installing and enabling service -mv /opt/Setup/Configs/duplicati.service /lib/systemd/system/duplicati.service -chmod +x /lib/systemd/system/duplicati.service +#Enabling service ln -s /lib/systemd/system/duplicati.service /etc/systemd/system/multi-user.target.wants/duplicati.service -#Fix SSL sert -/usr/share/ca-certificates/mozilla/DST_Root_CA_X3.crt -update-ca-certificates \ No newline at end of file diff --git a/CT-Files/duplicati/Scripts/PTKAppUpdate.sh b/CT-Files/duplicati/Scripts/PTKAppUpdate.sh index 7c94800..85a8abd 100644 --- a/CT-Files/duplicati/Scripts/PTKAppUpdate.sh +++ b/CT-Files/duplicati/Scripts/PTKAppUpdate.sh @@ -1,3 +1,3 @@ #!/bin/sh # Update script for updating apps with ProxmoxHelper/ProxMoxToolKit -bash /opt/UpdateDuplicati.sh \ No newline at end of file +/usr/bin/duplicati-autoupdater DOWNLOAD \ No newline at end of file diff --git a/CT-Files/duplicati/Scripts/UpdateDuplicati.sh b/CT-Files/duplicati/Scripts/UpdateDuplicati.sh deleted file mode 100644 index ce66744..0000000 --- a/CT-Files/duplicati/Scripts/UpdateDuplicati.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -#Get latest vesion -NewDuplicatiVer=$(curl -s https://api.github.com/repos/duplicati/duplicati/releases | grep 'tag_name.*' | grep 'beta' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " " |tr -d : |head -n 1) - -#Compare versions to check for update -if [ "$NewDuplicatiVer" = "$(cat /opt/Duplicati-installed)" ] ; then - echo 'Duplicati up-to-date' - exit -else - echo "Updater Disabled, Newer versions not compatible" - exit 123 - systemctl stop duplicati - rm -rf /opt/duplicati.bck - mv /opt/duplicati /opt/duplicati.bck - echo 'Updating Duplicati' - curl -L --retry 7 --retry-delay 5 $(curl -s https://api.github.com/repos/duplicati/duplicati/releases/tags/"$NewDuplicatiVer" | grep browser_download_url | grep .zip |grep -v signatures | sed -e s#^.*https#https# | tr -d \") -o /tmp/duplicati.zip - unzip /tmp/duplicati.zip -d /opt/duplicati - systemctl start duplicati - echo $NewDuplicatiVer > "/opt/Duplicati-installed" -fi \ No newline at end of file diff --git a/Readme.md b/Readme.md index 36178b9..f4a5b1a 100644 --- a/Readme.md +++ b/Readme.md @@ -220,7 +220,8 @@ lxc.mount.entry: /dev/ttyACM-Zwave dev/ttyACM-Zwave none bind,optional,create=fi * NFS server Available ## duplicati -* Available on http://``:8200 +1. Run the FistRun script in the container to set the password `bash /opt/Setup/Scripts/FirstRun.sh` +2. Available on http://``:8200 ## mailbackup * Info html page available on http://``:80