diff --git a/CT-Build/Debian.Jenkinsfile b/CT-Build/Debian.Jenkinsfile index 3cb18b7..00da26a 100644 --- a/CT-Build/Debian.Jenkinsfile +++ b/CT-Build/Debian.Jenkinsfile @@ -7,7 +7,7 @@ pipeline { string defaultValue: '192.168.200.11', description: 'Proxy server for packages, when enabled', name: 'ProxyServer' booleanParam description: 'will disable use of proxy server', name: 'DisProxy' checkboxParameter(name: 'ImgVariantList', format: 'JSON', displayNodePath: "//Variants/Variant", valueNodePath: "//Variants/Variant", description: 'Select the variant(s) that should be build', - pipelineSubmitContent: '{"Variants": [{"Variant": "minimal"},{"Variant": "default"},{"Variant": "jenkinsbuilder"},{"Variant": "imgbuilder"},{"Variant": "jenkins"},{"Variant": "mysql"},{"Variant": "pihole"},{"Variant": "collabora"},{"Variant": "jellyfin"},{"Variant": "domoticz"},{"Variant": "omadaV3"},{"Variant": "docker"},{"Variant": "smb"},{"Variant": "x2go"},{"Variant": "aptcacherng"},{"Variant": "nfs"},{"Variant": "duplicati"},{"Variant": "fileshelter"},{"Variant": "esphome"},{"Variant": "postgresql"},{"Variant": "linkwarden"}]}') + pipelineSubmitContent: '{"Variants": [{"Variant": "minimal"},{"Variant": "default"},{"Variant": "jenkinsbuilder"},{"Variant": "imgbuilder"},{"Variant": "jenkins"},{"Variant": "mysql"},{"Variant": "pihole"},{"Variant": "collabora"},{"Variant": "jellyfin"},{"Variant": "domoticz"},{"Variant": "docker"},{"Variant": "smb"},{"Variant": "x2go"},{"Variant": "aptcacherng"},{"Variant": "nfs"},{"Variant": "duplicati"},{"Variant": "fileshelter"},{"Variant": "esphome"},{"Variant": "postgresql"},{"Variant": "linkwarden"}]}') } options { skipDefaultCheckout() diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml index e541c26..e020fa3 100644 --- a/CT-Build/Debian.yaml +++ b/CT-Build/Debian.yaml @@ -1688,6 +1688,15 @@ actions: # Cleanup temporary shadow paths rm /etc/*- +#Temporarily disable sudo pseudo-terminal(since distrobuilder does not setup pty devices) +- trigger: post-packages + action: |- + #!/bin/sh + if [ -d "/etc/sudoers.d" ]; then + # If sudoers dir exists, presume sudo is installed + echo "Defaults !use_pty" > /etc/sudoers.d/DisablePTY + fi + #Run init script for NodeJS CT - trigger: post-files action: |- @@ -1800,8 +1809,12 @@ actions: - trigger: post-unpack action: |- #!/bin/bash - curl --retry 7 --retry-delay 5 -s http://repo.mysql.com/RPM-GPG-KEY-mysql-2023 | gpg --dearmor > /usr/share/keyrings/mysql-archive-keyring.gpg + curl --retry 7 --retry-delay 5 -s "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xb7b3b788a8d3785c" | gpg --dearmor > /usr/share/keyrings/mysql-archive-keyring.gpg password=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 10 | head -n 1) + apt update + grep ^Package: /var/lib/apt/lists/repo.mysql.com* + ls /var/lib/apt/lists/ + sleep 30 mkdir -p /opt/Setup echo $password > /opt/Setup/TempMysqlPasswd debconf-set-selections <<< "mysql-community-server mysql-community-server/root-pass password $password" @@ -1870,5 +1883,12 @@ actions: variants: - linkwarden +- trigger: post-files + action: |- + #!/bin/sh + if [ -f "/etc/sudoers.d/DisablePTY" ]; then + rm -f /etc/sudoers.d/DisablePTY + fi + mappings: architecture_map: debian \ No newline at end of file diff --git a/CT-Files/domoticz/Scripts/Init.sh b/CT-Files/domoticz/Scripts/Init.sh index 3499a14..63aca07 100644 --- a/CT-Files/domoticz/Scripts/Init.sh +++ b/CT-Files/domoticz/Scripts/Init.sh @@ -1,6 +1,6 @@ #!/bin/bash #Get Resources -curl -L --retry 7 --retry-delay 5 https://releases.domoticz.com/releases/release/domoticz_linux_x86_64.tgz -o "/opt/Setup/domoticz.tgz" || exit 1 +curl -L --retry 7 --retry-delay 5 https://releases.domoticz.com/release/domoticz_linux_x86_64.tgz -o "/opt/Setup/domoticz.tgz" || exit 1 #Adding service user adduser --system --shell /bin/bash --group --disabled-password --home /home/domoticz domoticz diff --git a/CT-Files/duplicati/Scripts/Init.sh b/CT-Files/duplicati/Scripts/Init.sh index e40f532..83a327a 100644 --- a/CT-Files/duplicati/Scripts/Init.sh +++ b/CT-Files/duplicati/Scripts/Init.sh @@ -11,8 +11,6 @@ curl -L --retry 7 --retry-delay 5 "https://github.com/duplicati/duplicati/releas apt install -y /opt/Setup/duplicati.deb #Remove Archive rm /opt/Setup/duplicati.deb -#Install updates-cript -mv /opt/Setup/Scripts/UpdateDuplicati.sh /opt/UpdateDuplicati.sh #Move configuration inplace mv /opt/Setup/Configs/Duplicati-env /etc/default/duplicati #Enabling service diff --git a/CT-Files/kavita/Scripts/UpdateKavita.sh b/CT-Files/kavita/Scripts/UpdateKavita.sh index 018c55d..de5d82f 100644 --- a/CT-Files/kavita/Scripts/UpdateKavita.sh +++ b/CT-Files/kavita/Scripts/UpdateKavita.sh @@ -11,8 +11,8 @@ else rm -rf /opt/kavita/* tar -C /opt/kavita --strip-components=1 -xf /tmp/kavita.tar.gz chown kavita: -R /opt/kavita - rm -rf /tmp/kavita.tar.gz - mv /tmp/kavitacfg/* /opt/kavita/config + rm -rf /tmp/kavita.tar.gz /opt/kavita/config + mv /tmp/kavitacfg /opt/kavita/config setcap 'cap_net_bind_service=+ep' /opt/kavita/Kavita chmod +x /opt/kavita/Kavita echo $NewKavitaVersion > /opt/kavita-installed diff --git a/CT-Files/nextcloud/Configs/php.conf b/CT-Files/nextcloud/Configs/php.conf index cf4d19f..e683e34 100644 --- a/CT-Files/nextcloud/Configs/php.conf +++ b/CT-Files/nextcloud/Configs/php.conf @@ -10,7 +10,7 @@ php_admin_value [date.timezone] = Europe/Amsterdam ; OPCACHE SETTINGS php_admin_value[opcache.memory_consumption] = 256 ;Not used since it is enabled using PHP.ini;php_admin_value[opcache.enable] = 1 -php_admin_value[opcache.interned_strings_buffer] = 32 +php_admin_value[opcache.interned_strings_buffer] = 1024 php_admin_value[opcache.max_accelerated_files] = 50000 php_admin_value[opcache.max_wasted_percentage] = 5 php_admin_value[opcache.revalidate_freq] = 0 diff --git a/Readme.md b/Readme.md index f4a5b1a..16fa0a0 100644 --- a/Readme.md +++ b/Readme.md @@ -26,7 +26,7 @@ This can be done on a privileged Debian CT (make sure to enable the Fuse, Nestin | collabora | Debian | CollaboraOffice WebService (CODE version) | | jellyfin | Debian | Jellyfin in-home streaming server | | domoticz | Debian | Domoticz home automation service | -| omadaV3 | Debian | TP-link Omada SDN controller(V3.2.14) | +| omadaV3 `(Unsupported)` | Debian | TP-link Omada SDN controller(V3.2.14) | | docker | Debian | Docker container service | | smb | Debian | Samba server | | x2go | Debian | Remote xfce desktop accessable via X2go | @@ -111,6 +111,7 @@ Then select the created credential and click save * Available on http://``:8080 ## omadaV3 +**This version of the Omada software is EOL, Build has been removed form Jenkins build list** * To set-up the system follow the initial set-up wizard on http://``:8088 ## docker @@ -206,7 +207,7 @@ lxc.mount.entry: /dev/ttyACM-Zwave dev/ttyACM-Zwave none bind,optional,create=fi ## hass -**EOL Use Docker with HomeAssistant compose file instead** +**EOL Use Docker with HomeAssistant compose file instead, Build has been removed form Jenkins build list** * After first start of CT HomeAssistant will finish its installation this will take at least 10 minutes * HomeAssistant available on http://``:8123