From 5d51321de5fe40c4b09d000a9981a853b8f053d1 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Sat, 1 Jul 2023 18:29:33 +0200 Subject: [PATCH 01/17] All Alpine CTs: Bumped release, Bumped PHP for Nextcloud, Mailbackup and Heimdall CT Bumped Alpine Release from 3.17 to 3.18 Bumped PHP Release from 8.1 to 8.2 --- .gitignore | 2 + .vscode/tasks.json | 5 ++- CT-Build/Alpine.yaml | 96 ++++++++++++++++++++++---------------------- 3 files changed, 53 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 867c6ae..8a29339 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,9 @@ *.tar.gz *.tar *.zip +*.sh.kate-swp /distrobuilder +/bin CT-Files/nginx/nginx_signing.rsa.pub CT-Files/transfersh/transfersh-linux-amd64 CT-Files/transfersh/transfershVersion diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 1720791..0f4d212 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,9 +4,10 @@ "version": "2.0.0", "tasks": [ { + // When ran in a Proxmox CT, expose a folder mountpoint and symlink to it MOUNTPOINT/build/template/cache and tell Proxmox this use this folder for LXC images "label": "BuildIMG", "type": "shell", - "command": " export XZ_DEFAULTS='-T 0'; ./distrobuilder build-lxc CT-Build/${input:Distro}.yaml -o image.variant=${input:BuildVariant} ;rm -f meta.tar.xz; mv ./rootfs.tar.xz /build/template/cache/${input:Distro}-${input:BuildVariant}.tar.xz", + "command": " export XZ_DEFAULTS='-T 0'; sudo ./distrobuilder build-lxc CT-Build/${input:Distro}.yaml -o image.variant=${input:BuildVariant} ;sudo chown $SUDO_USER:$SUDO_USER -R *.tar.xz ;rm -f meta.tar.xz; mv rootfs.tar.xz bin/${input:Distro}-${input:BuildVariant}.tar.xz", "problemMatcher": [], "group": { "kind": "build", @@ -16,7 +17,7 @@ { "label": "SetupImgBuilder", "type": "shell", - "command": "git clone https://github.com/lxc/distrobuilder distrobuilderSRC; cd distrobuilderSRC; gofmt -s -w .; go build -o ../ -v ./...; cd ../; rm -rf distrobuilderSRC", + "command": "mkdir bin;git clone https://github.com/lxc/distrobuilder distrobuilderSRC; cd distrobuilderSRC; gofmt -s -w .; go build -o ../ -v ./...; cd ../; rm -rf distrobuilderSRC", "problemMatcher": [], "group": { "kind": "build", diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml index 55c5165..a3188f9 100644 --- a/CT-Build/Alpine.yaml +++ b/CT-Build/Alpine.yaml @@ -1,6 +1,6 @@ image: distribution: "alpinelinux" - release: "3.17" + release: "3.18" source: downloader: alpinelinux-http @@ -456,34 +456,34 @@ packages: #PKGS for nextcloud - packages: - - php81-pdo_mysql - - php81-pecl-imagick - - php81-cli - - php81-pecl-apcu - - php81-pecl-redis - - php81-fpm - - php81-cgi - - php81-common - - php81-mbstring - - php81-curl - - php81-gd - - php81-intl - - php81-soap - - php81-xml - - php81-zip - - php81-pear - - php81-session - - php81-posix - - php81-pdo - - php81-dom - - php81-simplexml - - php81-xmlreader - - php81-xmlwriter - - php81-opcache - - php81-pcntl - - php81-fileinfo - - php81-bcmath - - php81-gmp + - php82-pdo_mysql + - php82-pecl-imagick + - php82-cli + - php82-pecl-apcu + - php82-pecl-redis + - php82-fpm + - php82-cgi + - php82-common + - php82-mbstring + - php82-curl + - php82-gd + - php82-intl + - php82-soap + - php82-xml + - php82-zip + - php82-pear + - php82-session + - php82-posix + - php82-pdo + - php82-dom + - php82-simplexml + - php82-xmlreader + - php82-xmlwriter + - php82-opcache + - php82-pcntl + - php82-fileinfo + - php82-bcmath + - php82-gmp - libpng - zlib - imagemagick @@ -528,12 +528,12 @@ packages: #PKGS for MailBackup - packages: - dovecot - - php81-xml - - php81-fpm - - php81-curl - - php81-dom - - php81-zip - - php81-mbstring + - php82-xml + - php82-fpm + - php82-curl + - php82-dom + - php82-zip + - php82-mbstring - php-openssl - py3-pip - sudo @@ -571,19 +571,19 @@ packages: #PKGS for Heimdall - packages: - git - - php81 - - php81-ctype - - php81-curl - - php81-pdo_sqlite - - php81-mbstring - - php81-json - - php81-zip - - php81-xml - - php81-fpm - - php81-session - - php81-openssl - - php81-tokenizer - - php81-fileinfo + - php82 + - php82-ctype + - php82-curl + - php82-pdo_sqlite + - php82-mbstring + - php82-json + - php82-zip + - php82-xml + - php82-fpm + - php82-session + - php82-openssl + - php82-tokenizer + - php82-fileinfo action: install variants: - heimdall From 4c44a1ba0934c0f1dc5915cced3cb023cd337c79 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Sat, 1 Jul 2023 18:59:30 +0200 Subject: [PATCH 02/17] Nextcloud and Heimdal CT: fixed PHP config for 8.2 --- CT-Files/heimdall/Configs/nginx.conf | 2 +- CT-Files/heimdall/Configs/php.conf | 4 +-- CT-Files/heimdall/Scripts/Init.sh | 8 ++--- CT-Files/nextcloud/Configs/nginx.conf | 2 +- CT-Files/nextcloud/Configs/php.conf | 4 +-- CT-Files/nextcloud/Scripts/FirstRun.sh | 34 +++++++++++----------- CT-Files/nextcloud/Scripts/Init.sh | 14 ++++----- CT-Files/nextcloud/Scripts/PTKAppUpdate.sh | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/CT-Files/heimdall/Configs/nginx.conf b/CT-Files/heimdall/Configs/nginx.conf index 5d02dd9..ba28641 100644 --- a/CT-Files/heimdall/Configs/nginx.conf +++ b/CT-Files/heimdall/Configs/nginx.conf @@ -37,7 +37,7 @@ http { } location ~ \.php$ { include fastcgi_params; - fastcgi_pass unix:/run/php-fpm81/php-fpm.sock; + fastcgi_pass unix:/run/php-fpm82/php-fpm.sock; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/CT-Files/heimdall/Configs/php.conf b/CT-Files/heimdall/Configs/php.conf index 010669c..f88d744 100644 --- a/CT-Files/heimdall/Configs/php.conf +++ b/CT-Files/heimdall/Configs/php.conf @@ -1,7 +1,7 @@ [heimdall] user = nginx group = nginx -listen = /run/php-fpm81/php-fpm.sock +listen = /run/php-fpm82/php-fpm.sock listen.owner = nginx listen.group = nginx php_admin_value[disable_functions] = exec,passthru,system @@ -27,7 +27,7 @@ php_admin_value[max_input_time] = 15 php_admin_value[cgi.fix_pathinfo] = 0 php_admin_value[allow_url_fopen] = 1 php_admin_value[file_uploads] = On -php_admin_value[open_basedir] = /opt/heimdall:/run/php-fpm81/php-fpm.sock:/tmp +php_admin_value[open_basedir] = /opt/heimdall:/run/php-fpm82/php-fpm.sock:/tmp php_admin_value[session.use_strict_mode] = 1 php_admin_value[session.cookie_httponly] = 1 diff --git a/CT-Files/heimdall/Scripts/Init.sh b/CT-Files/heimdall/Scripts/Init.sh index 050ad6b..434527b 100644 --- a/CT-Files/heimdall/Scripts/Init.sh +++ b/CT-Files/heimdall/Scripts/Init.sh @@ -5,9 +5,9 @@ rm -rf /etc/nginx/conf.d mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf #Configure Php-Fpm -rm -rf /etc/php81/php-fpm.d/* -mv /opt/Setup/Configs/php.conf /etc/php81/php-fpm.d/heimdall.conf -mv /opt/Setup/Configs/phpTimezone.ini /etc/php81/conf.d/04_date_timezone.ini +rm -rf /etc/php82/php-fpm.d/* +mv /opt/Setup/Configs/php.conf /etc/php82/php-fpm.d/heimdall.conf +mv /opt/Setup/Configs/phpTimezone.ini /etc/php82/conf.d/04_date_timezone.ini #Install Heimdall git clone -b 2.x https://github.com/linuxserver/Heimdall.git /opt/heimdall @@ -15,4 +15,4 @@ chown -R nginx:nginx /opt/heimdall #Enable services on boot rc-update add nginx -rc-update add php-fpm81 \ No newline at end of file +rc-update add php-fpm82 \ No newline at end of file diff --git a/CT-Files/nextcloud/Configs/nginx.conf b/CT-Files/nextcloud/Configs/nginx.conf index 6dc9a9f..ce1dfba 100644 --- a/CT-Files/nextcloud/Configs/nginx.conf +++ b/CT-Files/nextcloud/Configs/nginx.conf @@ -86,7 +86,7 @@ http { fastcgi_param HTTPS on; fastcgi_param modHeadersAvailable true; fastcgi_param front_controller_active true; - fastcgi_pass unix:/run/php-fpm81/php-fpm.sock; + fastcgi_pass unix:/run/php-fpm82/php-fpm.sock; fastcgi_intercept_errors on; fastcgi_request_buffering off; } diff --git a/CT-Files/nextcloud/Configs/php.conf b/CT-Files/nextcloud/Configs/php.conf index fc4db7e..18942f5 100644 --- a/CT-Files/nextcloud/Configs/php.conf +++ b/CT-Files/nextcloud/Configs/php.conf @@ -1,7 +1,7 @@ [nextcloud] user = nginx group = nginx -listen = /run/php-fpm81/php-fpm.sock +listen = /run/php-fpm82/php-fpm.sock listen.owner = nginx listen.group = nginx php_admin_value[disable_functions] = exec,passthru,system @@ -27,7 +27,7 @@ php_admin_value[memory_limit] = 512M php_admin_value[cgi.fix_pathinfo] = 0 php_admin_value[allow_url_fopen] = Off php_admin_value[file_uploads] = on -php_admin_value[open_basedir] = /opt/nextcloud/:/var/nextcloud:/run/php-fpm81/php-fpm.sock:/run/redis/redis.sock:/proc/meminfo:/proc/cpuinfo:/dev/urandom:/tmp +php_admin_value[open_basedir] = /opt/nextcloud/:/var/nextcloud:/run/php-fpm82/php-fpm.sock:/run/redis/redis.sock:/proc/meminfo:/proc/cpuinfo:/dev/urandom:/tmp php_admin_value[session.use_strict_mode] = 1 php_admin_value[session.cookie_httponly] = 1 ;HTTPSONLY php_admin_value[session.cookie_samesite] = Strict diff --git a/CT-Files/nextcloud/Scripts/FirstRun.sh b/CT-Files/nextcloud/Scripts/FirstRun.sh index 905a4d0..b4105d0 100644 --- a/CT-Files/nextcloud/Scripts/FirstRun.sh +++ b/CT-Files/nextcloud/Scripts/FirstRun.sh @@ -18,24 +18,24 @@ if [ $ThisScriptConfigured = no ]; then echo "Script is not configured" exit fi -sudo -u nginx php81 /opt/nextcloud/occ maintenance:install --database mysql --database-name "$MysqlDatabase" --database-host "$MysqlIP" --database-port "$MysqlPort" --database-user "$MysqlUsername" --database-pass "$MysqlPassword" --database-table-space "" --admin-user "$NextcloudUsername" --admin-pass "$NexcloudPassword" --data-dir /var/nextcloud +sudo -u nginx php82 /opt/nextcloud/occ maintenance:install --database mysql --database-name "$MysqlDatabase" --database-host "$MysqlIP" --database-port "$MysqlPort" --database-user "$MysqlUsername" --database-pass "$MysqlPassword" --database-table-space "" --admin-user "$NextcloudUsername" --admin-pass "$NexcloudPassword" --data-dir /var/nextcloud sed -n -i '/#SetupBlockStart/{:a;N;/#SetupBlockEnd/!ba;N;s/.*//};p' /etc/nginx/nginx.conf service nginx reload -sudo -u nginx php81 /opt/nextcloud/occ db:convert-filecache-bigint -sudo -u nginx php81 /opt/nextcloud/occ db:add-missing-indices -#sudo -u nginx php81 /opt/nextcloud/occ app:disable firstrunwizard -sudo -u nginx php81 /opt/nextcloud/occ config:system:set default_language --value=nl -sudo -u nginx php81 /opt/nextcloud/occ config:system:set default_locale --value=nl -sudo -u nginx php81 /opt/nextcloud/occ config:system:set default_phone_region --value=nl -sudo -u nginx php81 /opt/nextcloud/occ config:system:set skeletondirectory --value= -sudo -u nginx php81 /opt/nextcloud/occ config:system:set memcache.local --value='\OC\Memcache\APCu' -sudo -u nginx php81 /opt/nextcloud/occ config:system:set trashbin_retention_obligation --value=30,30 -sudo -u nginx php81 /opt/nextcloud/occ config:system:set memcache.distributed --value='\OC\Memcache\Redis' -sudo -u nginx php81 /opt/nextcloud/occ config:system:set memcache.locking --value='\OC\Memcache\Redis' -sudo -u nginx php81 /opt/nextcloud/occ config:system:set redis host --value=localhost -sudo -u nginx php81 /opt/nextcloud/occ config:system:set redis port --value=6379 -sudo -u nginx php81 /opt/nextcloud/occ config:system:set trusted_domains 1 --value="$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)" -sudo -u nginx php81 /opt/nextcloud/occ config:system:set overwrite.cli.url --value="$NextcloudWebProto://$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)" -sudo -u nginx php81 /opt/nextcloud/occ config:system:set overwriteprotocol --value="$NextcloudWebProto" \ No newline at end of file +sudo -u nginx php82 /opt/nextcloud/occ db:convert-filecache-bigint +sudo -u nginx php82 /opt/nextcloud/occ db:add-missing-indices +#sudo -u nginx php82 /opt/nextcloud/occ app:disable firstrunwizard +sudo -u nginx php82 /opt/nextcloud/occ config:system:set default_language --value=nl +sudo -u nginx php82 /opt/nextcloud/occ config:system:set default_locale --value=nl +sudo -u nginx php82 /opt/nextcloud/occ config:system:set default_phone_region --value=nl +sudo -u nginx php82 /opt/nextcloud/occ config:system:set skeletondirectory --value= +sudo -u nginx php82 /opt/nextcloud/occ config:system:set memcache.local --value='\OC\Memcache\APCu' +sudo -u nginx php82 /opt/nextcloud/occ config:system:set trashbin_retention_obligation --value=30,30 +sudo -u nginx php82 /opt/nextcloud/occ config:system:set memcache.distributed --value='\OC\Memcache\Redis' +sudo -u nginx php82 /opt/nextcloud/occ config:system:set memcache.locking --value='\OC\Memcache\Redis' +sudo -u nginx php82 /opt/nextcloud/occ config:system:set redis host --value=localhost +sudo -u nginx php82 /opt/nextcloud/occ config:system:set redis port --value=6379 +sudo -u nginx php82 /opt/nextcloud/occ config:system:set trusted_domains 1 --value="$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)" +sudo -u nginx php82 /opt/nextcloud/occ config:system:set overwrite.cli.url --value="$NextcloudWebProto://$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)" +sudo -u nginx php82 /opt/nextcloud/occ config:system:set overwriteprotocol --value="$NextcloudWebProto" \ No newline at end of file diff --git a/CT-Files/nextcloud/Scripts/Init.sh b/CT-Files/nextcloud/Scripts/Init.sh index 672e84f..375173d 100644 --- a/CT-Files/nextcloud/Scripts/Init.sh +++ b/CT-Files/nextcloud/Scripts/Init.sh @@ -7,12 +7,12 @@ rm -rf /etc/nginx/conf.d mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf #Configure Php-Cli -sed -i '/memory_limit =/c\memory_limit = 512M' /etc/php81/php.ini +sed -i '/memory_limit =/c\memory_limit = 512M' /etc/php82/php.ini #Configure Php-Fpm -rm -rf /etc/php81/php-fpm.d/* -mv /opt/Setup/Configs/php.conf /etc/php81/php-fpm.d/nextcloud.conf -mv /opt/Setup/Configs/phpTimezone.ini /etc/php81/conf.d/04_date_timezone.ini +rm -rf /etc/php82/php-fpm.d/* +mv /opt/Setup/Configs/php.conf /etc/php82/php-fpm.d/nextcloud.conf +mv /opt/Setup/Configs/phpTimezone.ini /etc/php82/conf.d/04_date_timezone.ini #Install Nextcloud mkdir /opt/nextcloud /var/nextcloud @@ -20,9 +20,9 @@ tar jxf /opt/Setup/nextcloud.tar.bz2 -C /opt/nextcloud --strip 1 rm -rf /opt/Setup/nextcloud.tar.bz2 chown -R nginx:nginx /opt/nextcloud chown -R nginx:nginx /var/nextcloud -echo "*/5 * * * * php81 -f /opt/nextcloud/cron.php > /dev/null 2>&1" >> /etc/crontabs/nginx -echo "apc.enable_cli=1" >> /etc/php81/php.ini +echo "*/5 * * * * php82 -f /opt/nextcloud/cron.php > /dev/null 2>&1" >> /etc/crontabs/nginx +echo "apc.enable_cli=1" >> /etc/php82/php.ini #Enable services on boot rc-update add nginx -rc-update add php-fpm81 +rc-update add php-fpm82 rc-update add redis \ No newline at end of file diff --git a/CT-Files/nextcloud/Scripts/PTKAppUpdate.sh b/CT-Files/nextcloud/Scripts/PTKAppUpdate.sh index 2ee193b..34d8130 100644 --- a/CT-Files/nextcloud/Scripts/PTKAppUpdate.sh +++ b/CT-Files/nextcloud/Scripts/PTKAppUpdate.sh @@ -1,3 +1,3 @@ #!/bin/sh # Update script for updating apps with ProxmoxHelper/ProxMoxToolKit -sudo -u nginx php81 /opt/nextcloud/updater/updater.phar --no-interaction \ No newline at end of file +sudo -u nginx php82 /opt/nextcloud/updater/updater.phar --no-interaction \ No newline at end of file From 74f0880b23f2f28d0dcd60f24348308dba0b3d18 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Sun, 2 Jul 2023 01:20:22 +0200 Subject: [PATCH 03/17] CT Nextcloud, z2mqtt and hass: Fixed bugs related to alpine release update CT Nextcloud: Updated HTTP headers in Nginx config CT hass: Fixed hacs installer and updated dependencies: replaced mariadb-connector-c-dev with mariadb-dev, and added ffmpeg-dev CT z2mqtt: replaced yarn with corepack --- CT-Build/Alpine.yaml | 3 ++- CT-Files/hass/Scripts/Init.sh | 7 ++++--- CT-Files/nextcloud/Configs/nginx.conf | 21 +++++++++++++++------ CT-Files/z2mqtt/Scripts/Init.sh | 4 ++-- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml index a3188f9..9135375 100644 --- a/CT-Build/Alpine.yaml +++ b/CT-Build/Alpine.yaml @@ -519,8 +519,9 @@ packages: - jpeg-dev - zlib-dev - bash - - mariadb-connector-c-dev + - mariadb-dev - eudev-dev + - ffmpeg-dev action: install variants: - hass diff --git a/CT-Files/hass/Scripts/Init.sh b/CT-Files/hass/Scripts/Init.sh index 037cf63..680b197 100644 --- a/CT-Files/hass/Scripts/Init.sh +++ b/CT-Files/hass/Scripts/Init.sh @@ -1,7 +1,7 @@ #!/bin/ash #Install HomeAssistant mkdir -p /opt/HomeAssistant/srv -mkdir -p /opt/HomeAssistant/data +mkdir -p /opt/HomeAssistant/data/custom_components/hacs touch /opt/HomeAssistant/data/home-assistant.log addgroup hass adduser -h /opt/HomeAssistant/data -D -G hass -s /bin/sh hass @@ -10,14 +10,15 @@ sudo -u hass python3 -m venv /opt/HomeAssistant/srv sudo -u hass sh -c '. /opt/HomeAssistant/srv/bin/activate && pip install --upgrade pip && pip3 install wheel mysqlclient sqlalchemy fnvhash && pip3 install homeassistant' #Install Home Assistant Community Store -sudo -u hass sh -c 'cd /opt/HomeAssistant/data && wget -O - https://get.hacs.xyz | bash -' +wget https://github.com/hacs/integration/releases/latest/download/hacs.zip -O /tmp/hacs.zip +sudo -u hass unzip /tmp/hacs.zip -d /opt/HomeAssistant/data/custom_components/hacs #Update script mv /opt/Setup/Scripts/UpdateHASS.sh /opt/UpdateHASS.sh #CleanUp rm -rf /opt/HomeAssistant/data/.cache/* -rm -rf /build/TMP/usr/lib/python3.9/__pycache__/* +rm -rf /usr/lib/python3.11/__pycache__/* #Setup HomeAssistant service mv /opt/Setup/Configs/hass.service /etc/init.d/hass diff --git a/CT-Files/nextcloud/Configs/nginx.conf b/CT-Files/nextcloud/Configs/nginx.conf index ce1dfba..a1af002 100644 --- a/CT-Files/nextcloud/Configs/nginx.conf +++ b/CT-Files/nextcloud/Configs/nginx.conf @@ -37,12 +37,21 @@ http { add_header Content-Type text/html; return 200 'To setup this container edit and run the FirstRun script `/opt/Setup/Scripts/FirstRun.sh`'; #SetupBlockEnd - add_header Referrer-Policy "no-referrer" always; - add_header X-Download-Options "noopen" always; - add_header X-Permitted-Cross-Domain-Policies "none" always; - add_header X-Robots-Tag "noindex, nofollow" always; - fastcgi_send_timeout 300; - fastcgi_read_timeout 300; + + ##Reverse proxy IP resolve + #set_real_ip_from ; + #real_ip_header X-Forwarded-For; + + add_header Referrer-Policy "no-referrer" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-Download-Options "noopen" always; + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Permitted-Cross-Domain-Policies "none" always; + add_header X-Robots-Tag "noindex, nofollow" always; + add_header X-XSS-Protection "1; mode=block" always; + + fastcgi_send_timeout 36000; + fastcgi_read_timeout 36000; fastcgi_hide_header X-Powered-By; fastcgi_buffers 64 4K; gzip on; diff --git a/CT-Files/z2mqtt/Scripts/Init.sh b/CT-Files/z2mqtt/Scripts/Init.sh index 63a7999..03a4f03 100644 --- a/CT-Files/z2mqtt/Scripts/Init.sh +++ b/CT-Files/z2mqtt/Scripts/Init.sh @@ -1,6 +1,6 @@ #!/bin/ash -#Install Yarn Globaly for zwavejs2mqtt -npm install -g yarn +#Install corpack globaly for zwavejs2mqtt +npm install -g corepack #Run folowing commands as 'node' user sudo -u node ash << EOF From 32a3d5748573f25295e400d5b4fe6c92c4ae95e3 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Sun, 2 Jul 2023 02:10:36 +0200 Subject: [PATCH 04/17] CT: Nextcloud added required sysvsem and exif php extentions --- CT-Build/Alpine.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml index 9135375..a088f94 100644 --- a/CT-Build/Alpine.yaml +++ b/CT-Build/Alpine.yaml @@ -484,6 +484,8 @@ packages: - php82-fileinfo - php82-bcmath - php82-gmp + - php82-sysvsem + - php82-exif - libpng - zlib - imagemagick From 7d06b09691e686bff1cbd479ceea77ee03e17172 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Wed, 12 Jul 2023 21:00:26 +0200 Subject: [PATCH 05/17] Pruged TvHeadend container Pruged the TvHeadend CT since it did not work properly --- CT-Build/Debian.Jenkinsfile | 2 +- CT-Build/Debian.yaml | 26 -------------------------- Readme.md | 6 ------ 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/CT-Build/Debian.Jenkinsfile b/CT-Build/Debian.Jenkinsfile index 1fc4486..97f4d3d 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": "tvheadend"},{"Variant": "x2go"},{"Variant": "aptcacherng"},{"Variant": "elkarbackupDEB"},{"Variant": "nfs"},{"Variant": "duplicati"},{"Variant": "fileshelter"},{"Variant": "esphome"}]}') + 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": "elkarbackupDEB"},{"Variant": "nfs"},{"Variant": "duplicati"},{"Variant": "fileshelter"},{"Variant": "esphome"}]}') } options { skipDefaultCheckout() diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml index 2490662..7416919 100644 --- a/CT-Build/Debian.yaml +++ b/CT-Build/Debian.yaml @@ -1031,7 +1031,6 @@ packages: - jellyfin - docker - smb - - tvheadend - x2go - aptcacherng - elkarbackupDEB @@ -1052,7 +1051,6 @@ packages: - omadaV3 - docker - smb - - tvheadend - x2go - aptcacherng - mysql @@ -1241,13 +1239,6 @@ packages: variants: - smb -#Tvheadend pkgs - - packages: - - tvheadend - action: install - variants: - - tvheadend - #X2go pkgs - packages: - gnome-themes-extra @@ -1424,13 +1415,6 @@ packages: variants: - smb -#Tvheadend Repo - - name: tvheadend.list - url: |- - deb [signed-by=/usr/share/keyrings/tvheadend-archive-keyring.gpg arch=amd64] https://apt.tvheadend.org/unstable {{ image.release }} main - variants: - - tvheadend - #GoogleChrome Repo - name: google-chrome.list url: |- @@ -1610,16 +1594,6 @@ actions: variants: - smb -#TvHeadend Repo key and inital username and password -- trigger: post-unpack - action: |- - #!/bin/bash - curl --retry 7 --retry-delay 5 -L -s https://doozer.io/keys/tvheadend/tvheadend/pgp | gpg --dearmor > /usr/share/keyrings/tvheadend-archive-keyring.gpg - debconf-set-selections <<< "tvheadend tvheadend/admin_username string setup" - debconf-set-selections <<< "tvheadend tvheadend/admin_password password setup" - variants: - - tvheadend - #GoogleChrome Repo key - trigger: post-unpack action: |- diff --git a/Readme.md b/Readme.md index b2b9c06..ff84f80 100644 --- a/Readme.md +++ b/Readme.md @@ -30,7 +30,6 @@ This can be done on a privileged Debian CT (make sure to enable the Fuse, Nestin | omadaV3 | Debian | TP-link Omada SDN controller(V3.2.14) | | docker | Debian | Docker container service | | smb | Debian | Samba server | -| tvheadend | Debian | Tvheadend server | | x2go | Debian | Remote xfce desktop accessable via X2go | | aptcacherng | Debian | Caching server for linux packages | | nfs | Debian | NFS server | @@ -214,11 +213,6 @@ lxc.mount.entry: /dev/ttyACM-Zwave dev/ttyACM-Zwave none bind,optional,create=fi * Webmin available on http://`` * Samba server Available -## tvheadend -**Do first login and setup wizard in a incognito/Private window, since the authentication system can get confused after setting the new username** -* Tvheadend Available on http://``:9981 -* Default credentials: setup/setup -* Follow the setup wizzard after login, otherwise authentication will be disabled ## x2go * Add a user by typing `adduser ` From de5c254ae93d2918450f4274bca612191e4909d4 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Thu, 13 Jul 2023 00:57:07 +0200 Subject: [PATCH 06/17] Added CT: freshrss --- .vscode/tasks.json | 2 +- CT-Build/Alpine.Jenkinsfile | 2 +- CT-Build/Alpine.yaml | 43 +++++++++++++++++++ CT-Files/freshrss/Configs/crontab | 1 + CT-Files/freshrss/Configs/nginx.conf | 52 +++++++++++++++++++++++ CT-Files/freshrss/Configs/php.conf | 39 +++++++++++++++++ CT-Files/freshrss/Configs/phpTimezone.ini | 2 + CT-Files/freshrss/Scripts/Init.sh | 24 +++++++++++ Readme.md | 11 ++++- 9 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 CT-Files/freshrss/Configs/crontab create mode 100644 CT-Files/freshrss/Configs/nginx.conf create mode 100644 CT-Files/freshrss/Configs/php.conf create mode 100644 CT-Files/freshrss/Configs/phpTimezone.ini create mode 100644 CT-Files/freshrss/Scripts/Init.sh diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 0f4d212..388533a 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,7 +7,7 @@ // When ran in a Proxmox CT, expose a folder mountpoint and symlink to it MOUNTPOINT/build/template/cache and tell Proxmox this use this folder for LXC images "label": "BuildIMG", "type": "shell", - "command": " export XZ_DEFAULTS='-T 0'; sudo ./distrobuilder build-lxc CT-Build/${input:Distro}.yaml -o image.variant=${input:BuildVariant} ;sudo chown $SUDO_USER:$SUDO_USER -R *.tar.xz ;rm -f meta.tar.xz; mv rootfs.tar.xz bin/${input:Distro}-${input:BuildVariant}.tar.xz", + "command": " export XZ_DEFAULTS='-T 0'; sudo ./distrobuilder build-lxc CT-Build/${input:Distro}.yaml -o image.variant=${input:BuildVariant} ;sudo chown $SUDO_USER:$SUDO_USER -R *.tar.xz ;rm -f meta.tar.xz; mv -f rootfs.tar.xz bin/${input:Distro}-${input:BuildVariant}.tar.xz", "problemMatcher": [], "group": { "kind": "build", diff --git a/CT-Build/Alpine.Jenkinsfile b/CT-Build/Alpine.Jenkinsfile index a4e3226..a9d3982 100644 --- a/CT-Build/Alpine.Jenkinsfile +++ b/CT-Build/Alpine.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": "gitea"},{"Variant": "nginx"},{"Variant": "ddns"},{"Variant": "transfersh"},{"Variant": "iscsi"},{"Variant": "z2mqtt"},{"Variant": "nodered"},{"Variant": "nodejs"},{"Variant": "nextcloud"},{"Variant": "mqtt"},{"Variant": "hass"},{"Variant": "mailbackup"},{"Variant": "elkarbackupALP"},{"Variant": "heimdall"},{"Variant": "vouchproxy"}]}') + pipelineSubmitContent: '{"Variants": [{"Variant": "minimal"},{"Variant": "default"},{"Variant": "gitea"},{"Variant": "nginx"},{"Variant": "ddns"},{"Variant": "transfersh"},{"Variant": "iscsi"},{"Variant": "z2mqtt"},{"Variant": "nodered"},{"Variant": "nodejs"},{"Variant": "nextcloud"},{"Variant": "mqtt"},{"Variant": "hass"},{"Variant": "mailbackup"},{"Variant": "elkarbackupALP"},{"Variant": "heimdall"},{"Variant": "vouchproxy"},{"Variant": "freshrss"}]}') } options { skipDefaultCheckout() diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml index a088f94..c7bec0b 100644 --- a/CT-Build/Alpine.yaml +++ b/CT-Build/Alpine.yaml @@ -368,6 +368,13 @@ files: variants: - vouchproxy + #FileForFreshrss +- path: /opt/Setup + generator: copy + source: CT-Files/freshrss + variants: + - freshrss + packages: manager: apk update: true @@ -389,6 +396,7 @@ packages: - mailbackup - elkarbackupALP - heimdall + - freshrss #PKGS for Default - packages: @@ -598,6 +606,39 @@ packages: variants: - vouchproxy +#PKGS for FreshRSS + - packages: + - git + - php82 + - php82-fpm + - php82-curl + - php82-gmp + - php82-intl + - php82-mbstring + - php82-xml + - php82-zip + - php82-ctype + - php82-dom + - php82-fileinfo + - php82-iconv + - php82-json + - php82-opcache + - php82-openssl + - php82-phar + - php82-session + - php82-simplexml + - php82-xmlreader + - php82-xmlwriter + - php82-xml + - php82-tokenizer + - php82-zlib + - php82-pdo_mysql + #- php82-pdo_sqlite + action: install + variants: + - freshrss + + repositories: - name: /etc/apk/repositories url: |- @@ -670,6 +711,7 @@ actions: - mailbackup - elkarbackupALP - heimdall + - freshrss #Run provided init script - trigger: post-files @@ -691,6 +733,7 @@ actions: - elkarbackupALP - heimdall - vouchproxy + - freshrss #Move App update script for ProxmoxHelper/ProxMoxToolKit, if CT has this script - trigger: post-files diff --git a/CT-Files/freshrss/Configs/crontab b/CT-Files/freshrss/Configs/crontab new file mode 100644 index 0000000..3576610 --- /dev/null +++ b/CT-Files/freshrss/Configs/crontab @@ -0,0 +1 @@ +27,57 * * * * php82 /opt/freshrss/app/actualize_script.php 2>> /proc/1/fd/2 > /tmp/FreshRSS.log \ No newline at end of file diff --git a/CT-Files/freshrss/Configs/nginx.conf b/CT-Files/freshrss/Configs/nginx.conf new file mode 100644 index 0000000..01a0098 --- /dev/null +++ b/CT-Files/freshrss/Configs/nginx.conf @@ -0,0 +1,52 @@ +user nginx; +worker_processes auto; +error_log /var/log/nginx/error.log notice; +pid /var/run/nginx.pid; + +events { + worker_connections 1024; +} + +http { + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + server_tokens off; + client_body_buffer_size 10K; + client_header_buffer_size 1k; + client_max_body_size 64m; + large_client_header_buffers 4 4k; + server_names_hash_bucket_size 64; + root /usr/share/nginx/html; + include /etc/nginx/mime.types; + default_type application/octet-stream; + access_log off; + error_log /var/log/nginx/error.log; + #Server config for FreshRSS + server { + listen 80 default_server; + listen [::]:80 default_server; + server_name _; + root /opt/freshrss/p/; + index index.php index.html; + + location / { + try_files $uri $uri/ index.php; + + } + location ~ \.php$ { + include fastcgi_params; + fastcgi_pass unix:/run/php-fpm82/php-fpm.sock; + fastcgi_split_path_info ^(.+\.php)(/.*)$; + set $path_info $fastcgi_path_info; + fastcgi_param PATH_INFO $path_info; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } + location ~ /\.ht { + deny all; + } + } +} \ No newline at end of file diff --git a/CT-Files/freshrss/Configs/php.conf b/CT-Files/freshrss/Configs/php.conf new file mode 100644 index 0000000..a785505 --- /dev/null +++ b/CT-Files/freshrss/Configs/php.conf @@ -0,0 +1,39 @@ +[freshrss] +user = nginx +group = nginx +listen = /run/php-fpm82/php-fpm.sock +listen.owner = nginx +listen.group = nginx +php_admin_value[disable_functions] = exec,passthru,system +php_admin_value[error_log] = /var/log/php-fpm.error.log +php_admin_value [date.timezone] = Europe/Amsterdam + +; OPCACHE SETTINGS +php_admin_value[opcache.memory_consumption] = 256 +php_admin_value[opcache.enable] = 0 +php_admin_value[opcache.interned_strings_buffer] = 32 +php_admin_value[opcache.max_accelerated_files] = 50000 +php_admin_value[opcache.max_wasted_percentage] = 5 +php_admin_value[opcache.revalidate_freq] = 0 +php_admin_value[opcache.validate_timestamps] = 1 + +; PERFORMANCE LIMITS +php_admin_value[max_input_vars] = 5000 +php_admin_value[upload_max_filesize] = 64M +php_admin_value[post_max_size] = 64M +php_admin_value[max_input_time] = 15 + +; SECURITY +php_admin_value[cgi.fix_pathinfo] = 0 +php_admin_value[allow_url_fopen] = 1 +php_admin_value[file_uploads] = On +php_admin_value[open_basedir] = /opt/freshrss:/run/php-fpm82/php-fpm.sock:/tmp +php_admin_value[session.use_strict_mode] = 1 +php_admin_value[session.cookie_httponly] = 1 + +pm = dynamic +pm.max_children = 5 +pm.start_servers = 2 +pm.min_spare_servers = 1 +pm.max_spare_servers = 3 +chdir = / \ No newline at end of file diff --git a/CT-Files/freshrss/Configs/phpTimezone.ini b/CT-Files/freshrss/Configs/phpTimezone.ini new file mode 100644 index 0000000..cb46e97 --- /dev/null +++ b/CT-Files/freshrss/Configs/phpTimezone.ini @@ -0,0 +1,2 @@ +[Date] +date.timezone = Europe/Amsterdam \ No newline at end of file diff --git a/CT-Files/freshrss/Scripts/Init.sh b/CT-Files/freshrss/Scripts/Init.sh new file mode 100644 index 0000000..10aa6b9 --- /dev/null +++ b/CT-Files/freshrss/Scripts/Init.sh @@ -0,0 +1,24 @@ +#!/bin/ash + +#Configure Nginx +rm -rf /etc/nginx/conf.d +mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf + +#Configure Php-Fpm +rm -rf /etc/php82/php-fpm.d/* +mv /opt/Setup/Configs/php.conf /etc/php82/php-fpm.d/freshrss.conf +mv /opt/Setup/Configs/phpTimezone.ini /etc/php82/conf.d/04_date_timezone.ini + +#Configure Cron +mv /opt/Setup/Configs/crontab /etc/crontabs/nginx + +#Install freshrss +mkdir -p /opt/freshrss +wget https://github.com/FreshRSS/FreshRSS/tarball/latest -O /tmp/freshrss.tar.gz +tar -C /opt/freshrss -xzf /tmp/freshrss.tar.gz --strip 1 +chown -R nginx:nginx /opt/freshrss +rm /tmp/freshrss.tar.gz + +#Enable services on boot +rc-update add nginx +rc-update add php-fpm82 \ No newline at end of file diff --git a/Readme.md b/Readme.md index ff84f80..747a128 100644 --- a/Readme.md +++ b/Readme.md @@ -50,6 +50,7 @@ This can be done on a privileged Debian CT (make sure to enable the Fuse, Nestin | mailbackup | Alpine | Contains mail archive tools (MailBackup-sys) | | heimdall | Alpine | Heimdall, A application dashboard/launcher | | vouchproxy | Alpine | Vouch-proxy, A SSO solution for Nginx | +| freshrss | Alpine | FreshRSS, a self-hosted RSS feed aggregator | ## TODO **Begin original list** @@ -172,11 +173,16 @@ exit KERNEL=="ttyUSB[0-9]*", MODE="0666" KERNEL=="ttyACM[0-9]*", MODE="0666" ``` -#### Add for Sonoff Zigbee 3.0 USB (CC2652P + CP2102N) +#### Add for Sonoff Zigbee 3.0 Plus USB ZBDongel-P (CC2652P + CP2102N) ``` SUBSYSTEM=="tty", ACTION=="change", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", SYMLINK+="ttyACM-Zigbee" SUBSYSTEM=="tty", ACTION=="add", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", SYMLINK+="ttyACM-Zigbee" ``` +#### Add for Sonoff Zigbee 3.0 Plus USB ZBDongel-E (EFR32MG21) +``` +SUBSYSTEM=="tty", ACTION=="change", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="55d4", SYMLINK+="ttyACM-Zigbee" +SUBSYSTEM=="tty", ACTION=="add", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="55d4", SYMLINK+="ttyACM-Zigbee" +``` #### Add for Zigbee CC2531 USB ``` SUBSYSTEM=="tty", ACTION=="change", ATTRS{idVendor}=="0451", ATTRS{idProduct}=="16a8", SYMLINK+="ttyACM-Zigbee" @@ -246,6 +252,9 @@ lxc.mount.entry: /dev/ttyACM-Zwave dev/ttyACM-Zwave none bind,optional,create=fi * Default port 9090 * A script to setup another instance is located here: `/opt/AddVouchInstance.sh` +## freshrss +* Available on http://``:80 + ## elkarbackup **Alpine version recommended** 1. Edit the parameters in the FistRun script in the container `vi /opt/Setup/Scripts/FirstRun.sh` From 1a7e0986444ebc648c4ddfa59b5a45947d0ad770 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Thu, 24 Aug 2023 23:09:58 +0200 Subject: [PATCH 07/17] CT mysql, jenkins: Fixed Typo in First run scripts --- CT-Files/jenkins/Scripts/FirstRun.sh | 6 +++--- CT-Files/mysql/Scripts/FirstRun.sh | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CT-Files/jenkins/Scripts/FirstRun.sh b/CT-Files/jenkins/Scripts/FirstRun.sh index 08003cb..cac6114 100644 --- a/CT-Files/jenkins/Scripts/FirstRun.sh +++ b/CT-Files/jenkins/Scripts/FirstRun.sh @@ -8,7 +8,7 @@ LXCBuilderIP= #StaticVars AdminPassword=$(cat /var/lib/jenkins/secrets/initialAdminPassword) -JeninsPlugins="dark-theme ssh-slaves workflow-aggregator locale golang git dark-theme copyartifact ws-cleanup pipeline-stage-view custom-checkbox-parameter parameterized-scheduler" +JenkinsPlugins="dark-theme ssh-slaves workflow-aggregator locale golang git dark-theme copyartifact ws-cleanup pipeline-stage-view custom-checkbox-parameter parameterized-scheduler" #Check if script is configured if [ $ThisScriptConfigured = no ]; then @@ -19,7 +19,7 @@ fi #Download Jenkins-CLI tool curl localhost:8080/jnlpJars/jenkins-cli.jar -o /opt/jenkins-cli.jar #Install Plugins -java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword install-plugin $JeninsPlugins +java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword install-plugin $JenkinsPlugins echo "jenkins.model.Jenkins.instance.securityRealm.createAccount(\"$JenkinsUsername\", \"$JenkinsPassword\")" | java -jar /opt/jenkins-cli.jar -s "http://localhost:8080" -webSocket -auth admin:$AdminPassword groovy = – #Installed plugin versions @@ -53,4 +53,4 @@ java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin: java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword build LXC-ImgBuilder/Debian-LXC java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword build LXC-ImgBuilder/Alpine-LXC echo "Debian-LXC and Alpine-LXC build will fail, this is expected behaviour" -echo "Next step is to login to the jenins instance, update the credentials for the Node and delete the admin user" \ No newline at end of file +echo "Next step is to login to the Jenkins instance, update the credentials for the Node and delete the admin user" \ No newline at end of file diff --git a/CT-Files/mysql/Scripts/FirstRun.sh b/CT-Files/mysql/Scripts/FirstRun.sh index 3e6a30b..398fa68 100644 --- a/CT-Files/mysql/Scripts/FirstRun.sh +++ b/CT-Files/mysql/Scripts/FirstRun.sh @@ -4,7 +4,6 @@ echo #StaticVars TempPassword=$(cat /opt/Setup/TempMysqlPasswd) -JeninsPlugins="dark-theme ssh-slaves workflow-aggregator locale golang git dark-theme copyartifact ws-cleanup" #Configure PhpMyAdmin mysql -u root --password="$TempPassword" < /opt/PhpMyAdmin/sql/create_tables.sql From b519337f22e6cfabf90ed6a45aba6cc1c2629eb0 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Wed, 20 Sep 2023 23:39:36 +0200 Subject: [PATCH 08/17] CT NodeRed: Update Theme The midnight-red theme is now meged in the theme-collection. These changes are reflected in the init and update script --- CT-Files/nodered/Scripts/Init.sh | 2 +- CT-Files/nodered/Scripts/Update-NodeRed.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CT-Files/nodered/Scripts/Init.sh b/CT-Files/nodered/Scripts/Init.sh index a9a52a6..1932099 100644 --- a/CT-Files/nodered/Scripts/Init.sh +++ b/CT-Files/nodered/Scripts/Init.sh @@ -3,7 +3,7 @@ sudo -u node ash << EOF #Install nodered mkdir -p /opt/node/node-red/app -npm install --prefix /opt/node/node-red/app node-red @node-red-contrib-themes/midnight-red +npm install --prefix /opt/node/node-red/app node-red @node-red-contrib-themes/theme-collection ##Add to startup diff --git a/CT-Files/nodered/Scripts/Update-NodeRed.sh b/CT-Files/nodered/Scripts/Update-NodeRed.sh index 0cb5f01..190caec 100644 --- a/CT-Files/nodered/Scripts/Update-NodeRed.sh +++ b/CT-Files/nodered/Scripts/Update-NodeRed.sh @@ -2,7 +2,7 @@ #Run folowing commands as 'node' user sudo -u node ash << EOF /usr/local/bin/pm2 stop nodered -npm install --prefix /opt/node/node-red/app node-red @node-red-contrib-themes/midnight-red +npm install --prefix /opt/node/node-red/app node-red @node-red-contrib-themes/theme-collection npm update --prefix /opt/node/node-red/app /usr/local/bin/pm2 start nodered EOF From 3f81aaf2fad471a47d7a450fac6ee4ba285c3b0a Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Thu, 28 Sep 2023 22:10:20 +0200 Subject: [PATCH 09/17] Fixed go downloader in FirstSetup.sh --- Scripts/FirstSetup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/FirstSetup.sh b/Scripts/FirstSetup.sh index fc6b998..5b26637 100644 --- a/Scripts/FirstSetup.sh +++ b/Scripts/FirstSetup.sh @@ -11,7 +11,7 @@ apt install ca-certificates git make debootstrap curl gcc libc-dev nano gnupg2 r #Install go rm -rf /usr/local/go -curl -L https://go.dev/dl/go$(curl -Ls https://go.dev/VERSION?m=text |sed 's/go//g').linux-amd64.tar.gz -o /tmp/go.tar.gz +curl -L https://go.dev/dl/go$(curl -Ls https://go.dev/VERSION?m=text | sed 's/go//g' | head -n1).linux-amd64.tar.gz -o /tmp/go.tar.gz tar -C /usr/local -xzf /tmp/go.tar.gz echo "export PATH=$PATH:/usr/local/go/bin" >> $HOME/.profile export PATH=$PATH:/usr/local/go/bin From 9d3bfb1e926ffe354ff5c3d25fd02f2593796e99 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Fri, 17 Nov 2023 22:24:34 +0100 Subject: [PATCH 10/17] Initial upgraded Debian CT to version 12 - Adapted wsdd(Web Service Discovery) configuration for native debian version - Added Debian12 repo key --- CT-Build/Debian.yaml | 215 ++++++++++++++++++++++++++++++--- CT-Files/smb/Configs/wsdd.conf | 6 +- CT-Files/smb/Scripts/Init.sh | 2 +- 3 files changed, 207 insertions(+), 16 deletions(-) diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml index 7416919..29b645d 100644 --- a/CT-Build/Debian.yaml +++ b/CT-Build/Debian.yaml @@ -1,6 +1,6 @@ image: distribution: "debian" - release: "bullseye" + release: "bookworm" source: downloader: debootstrap @@ -783,6 +783,193 @@ source: qn8+ouVQUr65+xcIST13Ffg80zc= =lfn1 -----END PGP PUBLIC KEY BLOCK----- + - |- + -----BEGIN PGP PUBLIC KEY BLOCK----- + + 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 + NlB2T6bKGcYGqL7L + =UUyy + -----END PGP PUBLIC KEY BLOCK----- variant: minbase @@ -1408,12 +1595,12 @@ packages: - smb - nfs -#WSDD (Web Services Dynamic Discovery) Repo - - name: wsdd.list - url: |- - deb [signed-by=/usr/share/keyrings/wsdd-archive-keyring.gpg arch=amd64] https://pkg.ltec.ch/public/ {{ image.release }} main - variants: - - smb +#WSDD (Web Services Dynamic Discovery) Repo (Disabled since the package being in the main Deban repo [since V12 BookWorm]) +# - name: wsdd.list +# url: |- +# deb [signed-by=/usr/share/keyrings/wsdd-archive-keyring.gpg arch=amd64] https://pkg.ltec.ch/public/ {{ image.release }} main +# variants: +# - smb #GoogleChrome Repo - name: google-chrome.list @@ -1586,13 +1773,13 @@ actions: - smb - nfs -#Wsdd Repo key -- trigger: post-unpack - action: |- - #!/bin/sh - curl --retry 7 --retry-delay 5 -L -s https://pkg.ltec.ch/public/conf/ltec-ag.gpg.key | gpg --dearmor > /usr/share/keyrings/wsdd-archive-keyring.gpg - variants: - - smb +#Wsdd Repo key (Disabled since the package being in the main Deban repo [since V12 BookWorm]) +#- trigger: post-unpack +# action: |- +# #!/bin/sh +# curl --retry 7 --retry-delay 5 -L -s https://pkg.ltec.ch/public/conf/ltec-ag.gpg.key | gpg --dearmor > /usr/share/keyrings/wsdd-archive-keyring.gpg +# variants: +# - smb #GoogleChrome Repo key - trigger: post-unpack diff --git a/CT-Files/smb/Configs/wsdd.conf b/CT-Files/smb/Configs/wsdd.conf index 41a32fc..c0dd8a1 100644 --- a/CT-Files/smb/Configs/wsdd.conf +++ b/CT-Files/smb/Configs/wsdd.conf @@ -1,2 +1,6 @@ -# command line parameters for wsdd (consult man page) +# +# Defaults file for wsdd +# +# Useful args here are -i eth0 -6 etc +# Consult wsdd(8) man page WSDD_PARAMS="-p" \ No newline at end of file diff --git a/CT-Files/smb/Scripts/Init.sh b/CT-Files/smb/Scripts/Init.sh index ead7d11..7cc1340 100644 --- a/CT-Files/smb/Scripts/Init.sh +++ b/CT-Files/smb/Scripts/Init.sh @@ -1,6 +1,6 @@ #!/bin/bash addgroup smb -mv /opt/Setup/Configs/wsdd.conf /etc/wsdd.conf +mv /opt/Setup/Configs/wsdd.conf /etc/default/wsdd.conf mv /opt/Setup/Configs/smb.conf /etc/samba/smb.conf mv /opt/Setup/Configs/smb.service.avahi /etc/avahi/services/smb.service echo "login_message=Samba Server on" >/etc/webmin/authentic-theme/custom-lang From 7a087693fcc6dd6f1cc5abc6fbf6291c0b79537e Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Fri, 17 Nov 2023 22:42:14 +0100 Subject: [PATCH 11/17] Fixed Distrobuilder Jenkinsfile --- Other-Builds/DistroBuilder.Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Other-Builds/DistroBuilder.Jenkinsfile b/Other-Builds/DistroBuilder.Jenkinsfile index 68943f8..3e2544c 100644 --- a/Other-Builds/DistroBuilder.Jenkinsfile +++ b/Other-Builds/DistroBuilder.Jenkinsfile @@ -14,7 +14,7 @@ pipeline { // Cleanup before starting cleanWs() // Checkout the repository - git 'https://github.com/lxc/distrobuilder' + git branch: 'main', url: 'https://github.com/lxc/distrobuilder' } } stage('Image Configs'){ From 4625ae9fa93a78cb709d836b1a5eec2f8995f700 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Fri, 17 Nov 2023 23:45:46 +0100 Subject: [PATCH 12/17] CT Pihole: Fixed packages for Debian 12 --- CT-Build/Debian.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml index 29b645d..a270918 100644 --- a/CT-Build/Debian.yaml +++ b/CT-Build/Debian.yaml @@ -1334,7 +1334,7 @@ packages: - curl - iputils-ping - lsof - - netcat + - netcat-openbsd - psmisc - sudo - unzip @@ -1343,6 +1343,8 @@ packages: - libcap2-bin - dns-root-data - libcap2 + - jq + - procps - lighttpd - php-common - php-cli @@ -1569,7 +1571,7 @@ packages: #collabora CODE repo - name: collabora.list url: |- - deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg arch=amd64] https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-debian11 ./ + deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg arch=amd64] https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb ./ variants: - collabora From 1bb3dc462d01a7619e7ac2f6ffe4a1a0a8860c84 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Fri, 17 Nov 2023 23:52:50 +0100 Subject: [PATCH 13/17] CT X2go: Fixed packages for Debian 12 Removed `remmina-plugin-spice` since it is not available anymore --- CT-Build/Debian.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml index a270918..f3e96bd 100644 --- a/CT-Build/Debian.yaml +++ b/CT-Build/Debian.yaml @@ -1466,7 +1466,7 @@ packages: - remmina - remmina-plugin-rdp - remmina-plugin-vnc - - remmina-plugin-spice +# - remmina-plugin-spice - virt-viewer action: install variants: From 631f76eb320a26abf6af4f2be18fa059be605fa3 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Fri, 17 Nov 2023 23:54:57 +0100 Subject: [PATCH 14/17] CT fileshelter: Fixed gpg key Updated gpg key url for fileshelter repository --- CT-Build/Debian.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml index f3e96bd..e287fb5 100644 --- a/CT-Build/Debian.yaml +++ b/CT-Build/Debian.yaml @@ -1811,7 +1811,7 @@ actions: - trigger: post-unpack action: |- #!/bin/sh - curl --retry 7 --retry-delay 5 -L -s https://debian.poupon.dev/apt/debian/epoupon.gpg.key | gpg --dearmor > /usr/share/keyrings/fileshelter-keyring.gpg + curl --retry 7 --retry-delay 5 -L -s https://debian.poupon.dev/apt/debian/epoupon.gpg | gpg --dearmor > /usr/share/keyrings/fileshelter-keyring.gpg variants: - fileshelter From a9c44ab6f7eb528641429f6c0b5770924eabfe87 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Sat, 18 Nov 2023 00:22:27 +0100 Subject: [PATCH 15/17] CT NFS & SMB: Updated webmin repo and key --- CT-Build/Debian.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml index e287fb5..52b60b5 100644 --- a/CT-Build/Debian.yaml +++ b/CT-Build/Debian.yaml @@ -1592,7 +1592,7 @@ packages: #Webmin repo - name: webmin.list url: |- - deb [signed-by=/usr/share/keyrings/webmin-archive-keyring.gpg arch=amd64] http://download.webmin.com/download/repository sarge contrib + deb [signed-by=/usr/share/keyrings/webmin-archive-keyring.gpg arch=amd64] https://download.webmin.com/download/newkey/repository stable contrib variants: - smb - nfs @@ -1770,7 +1770,7 @@ actions: - trigger: post-unpack action: |- #!/bin/sh - curl --retry 7 --retry-delay 5 -L -s http://www.webmin.com/jcameron-key.asc | gpg --dearmor > /usr/share/keyrings/webmin-archive-keyring.gpg + curl --retry 7 --retry-delay 5 -L -s https://download.webmin.com/developers-key.asc | gpg --dearmor > /usr/share/keyrings/webmin-archive-keyring.gpg variants: - smb - nfs From 86165459b759a7305ef65afbeaddd1096cefe1c2 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Sat, 18 Nov 2023 00:57:31 +0100 Subject: [PATCH 16/17] CT ddns: Fixes for latest alpine update -ddns moved to From edge-Testing to edge-comunity --- CT-Build/Alpine.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml index c7bec0b..c965e80 100644 --- a/CT-Build/Alpine.yaml +++ b/CT-Build/Alpine.yaml @@ -418,8 +418,8 @@ packages: #PKGS for Ddns - packages: - - ddclient@TestingEdge - - perl-data-validate-ip@TestingEdge + - ddclient@CommunityEdge + #- perl-data-validate-ip@TestingEdge action: install variants: - ddns @@ -646,8 +646,8 @@ packages: http://dl-4.alpinelinux.org/alpine/v{{ image.release }}/main http://dl-4.alpinelinux.org/alpine/v{{ image.release }}/community #EndREPOS - {% if image.variant == "ddns" %}@TestingEdge http://dl-4.alpinelinux.org/alpine/edge/testing{% endif %} - {% if image.variant == "NoExist" %}@CommunityEdge http://dl-4.alpinelinux.org/alpine/edge/community{% endif %} + {% if image.variant == "NoExist" %}@TestingEdge http://dl-4.alpinelinux.org/alpine/edge/testing{% endif %} + {% if image.variant == "ddns" %}@CommunityEdge http://dl-4.alpinelinux.org/alpine/edge/community{% endif %} {% if image.variant == "elkarbackupALP" %}@CommunityOldStable http://dl-4.alpinelinux.org/alpine/v3.15/community{% endif %} actions: From 201b880eae882c49787b4ab7798ccfbf06755ab8 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Sat, 18 Nov 2023 02:24:23 +0100 Subject: [PATCH 17/17] CT ElkarBackup: Removed debian version The project is discontinued and deb repo's are disabled Unable to run the package on Debian 12 due to unmet "deprecated" dependencies keeping the Alpine version for now since it is ran form source code --- CT-Build/Debian.Jenkinsfile | 2 +- CT-Build/Debian.yaml | 35 +------------------ .../Configs/elkarbackupconf.yaml | 27 -------------- CT-Files/elkarbackupDEB/Scripts/FirstRun.sh | 16 --------- CT-Files/elkarbackupDEB/Scripts/Init.sh | 11 ------ Readme.md | 6 ++-- 6 files changed, 5 insertions(+), 92 deletions(-) delete mode 100644 CT-Files/elkarbackupDEB/Configs/elkarbackupconf.yaml delete mode 100644 CT-Files/elkarbackupDEB/Scripts/FirstRun.sh delete mode 100644 CT-Files/elkarbackupDEB/Scripts/Init.sh diff --git a/CT-Build/Debian.Jenkinsfile b/CT-Build/Debian.Jenkinsfile index 97f4d3d..fc6de39 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": "elkarbackupDEB"},{"Variant": "nfs"},{"Variant": "duplicati"},{"Variant": "fileshelter"},{"Variant": "esphome"}]}') + 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"}]}') } options { skipDefaultCheckout() diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml index 52b60b5..677fb06 100644 --- a/CT-Build/Debian.yaml +++ b/CT-Build/Debian.yaml @@ -1164,13 +1164,6 @@ files: variants: - aptcacherng -#FileForElkarbackup -- path: /opt/Setup - generator: copy - source: CT-Files/elkarbackupDEB - variants: - - elkarbackupDEB - #FileForNFS - path: /opt/Setup generator: copy @@ -1220,7 +1213,6 @@ packages: - smb - x2go - aptcacherng - - elkarbackupDEB - nfs - duplicati - fileshelter @@ -1479,15 +1471,6 @@ packages: variants: - aptcacherng -#elkarbackupDEB pkgs - - packages: - - nano - - cron - - ssl-cert - action: install - variants: - - elkarbackupDEB - #NFS pkgs - packages: - nfs-kernel-server @@ -1611,13 +1594,6 @@ packages: variants: - x2go -#Elkarbackup Repo - - name: elkarbackup.list - url: |- - deb [signed-by=/usr/share/keyrings/elkarbackup-archive-keyring.gpg arch=amd64] http://elkarbackup.org/apt/debian {{ image.release }} main - variants: - - elkarbackupDEB - ##Mono Repo (Disabled, Debain repo version compatible) # - name: mono.list # url: |- @@ -1626,7 +1602,7 @@ packages: # - duplicati #FileShelter Repo - - name: elkarbackup.list + - name: FileShelter.list url: |- deb [signed-by=/usr/share/keyrings/fileshelter-keyring.gpg] https://debian.poupon.dev/apt/debian {{ image.release }} main variants: @@ -1683,7 +1659,6 @@ actions: - smb - x2go - aptcacherng - - elkarbackupDEB - nfs - duplicati - fileshelter @@ -1791,14 +1766,6 @@ actions: variants: - x2go -#ElkarBackup Repo key -- trigger: post-unpack - action: |- - #!/bin/sh - curl --retry 7 --retry-delay 5 -L -s http://elkarbackup.org/apt/archive.gpg.key | gpg --dearmor > /usr/share/keyrings/elkarbackup-archive-keyring.gpg - variants: - - elkarbackupDEB - ##Mono Repo key (Disabled since repo is not in use) #- trigger: post-unpack # action: |- diff --git a/CT-Files/elkarbackupDEB/Configs/elkarbackupconf.yaml b/CT-Files/elkarbackupDEB/Configs/elkarbackupconf.yaml deleted file mode 100644 index 3750c78..0000000 --- a/CT-Files/elkarbackupDEB/Configs/elkarbackupconf.yaml +++ /dev/null @@ -1,27 +0,0 @@ -parameters: - database_driver: pdo_mysql - database_host: DBServer - database_port: null - database_name: DBName - database_user: DBUser - database_password: DBPass - mailer_transport: smtp - mailer_host: localhost - mailer_user: null - mailer_password: null - locale: en - secret: ElkarToken - database_path: null - upload_dir: /var/spool/elkarbackup/uploads - public_key: /var/lib/elkarbackup/.ssh/id_rsa.pub - max_log_age: P1Y - tmp_dir: /tmp - rsnapshot: /usr/bin/rsnapshot - warning_load_level: 0.8 - pagination_lines_per_page: 20 - url_prefix: null - disable_background: true - mailer_from: null - home: /var/lib/elkarbackup - max_parallel_jobs: 1 - post_on_pre_fail: true \ No newline at end of file diff --git a/CT-Files/elkarbackupDEB/Scripts/FirstRun.sh b/CT-Files/elkarbackupDEB/Scripts/FirstRun.sh deleted file mode 100644 index 3ce4120..0000000 --- a/CT-Files/elkarbackupDEB/Scripts/FirstRun.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/ash -ThisScriptConfigured=no -##DB -MysqlIP=127.0.0.1 -MysqlUsername=elkarbackup -MysqlDatabase=elkarbackup -MysqlPassword=Password - -#Check if script is configured -if [ $ThisScriptConfigured = no ]; then - echo "Script is not configured" - exit -fi - -sed -i -e 's/DBServer/'$MysqlIP'/' -e 's/DBName/'$MysqlDatabase'/' -e 's/DBUser/'$MysqlUsername'/' -e 's/DBPass/'$MysqlPassword'/' -e 's/ElkarToken/'$(tr -dc 'A-Za-z0-9!#%*+,-.:;<=>?@^_' 2>/dev/null `:80 -## elkarbackup -**Alpine version recommended** +## elkarbackupALP +**Debian version depricated and removed** 1. Edit the parameters in the FistRun script in the container `vi /opt/Setup/Scripts/FirstRun.sh` 2. Run the FistRun script in the container `ash /opt/Setup/Scripts/FirstRun.sh` 3. Available on http://`` (Default username/password: root/root)