Merge pull request 'Periodic merge Dev into Main' (#6) from dev into main

Reviewed-on: #6
2025-05-10 00:49:35 +02:00
parent 96328955ad 31629ec39f
commit 1925682277
14 changed files with 73 additions and 46 deletions
--- a/CT-Build/Debian.yaml
+++ b/CT-Build/Debian.yaml
@@ -1339,33 +1339,26 @@ packages:

 #pihole pkgs    
  - packages:
+    - grep
    - grep
    - dnsutils
+    - binutils
    - git
    - iproute2
-    - whiptail
+    - dialog
    - cron
    - curl
    - iputils-ping
-    - lsof
-    - netcat-openbsd
    - psmisc
    - sudo
    - unzip
-    - idn2
-    - sqlite3
    - libcap2-bin
    - dns-root-data
    - libcap2
-    - jq
+    - netcat-openbsd
    - procps
-    - lighttpd
-    - php-common
-    - php-cli
-    - php-cgi
-    - php-sqlite3
-    - php-xml
-    - php-intl
+    - jq
+    - lshw
    action: install
    variants:
    - pihole
--- a/CT-Files/hass/Scripts/Init.sh
+++ b/CT-Files/hass/Scripts/Init.sh
@@ -4,7 +4,7 @@ mkdir -p /opt/HomeAssistant/srv
 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
+adduser -h /opt/HomeAssistant -D -G hass -s /bin/sh hass
 chown -R hass:hass /opt/HomeAssistant
 sudo -u hass python3 -m venv /opt/HomeAssistant/srv

--- a/CT-Files/linkwarden/Scripts/FirstRun.sh
+++ b/CT-Files/linkwarden/Scripts/FirstRun.sh
@@ -26,6 +26,6 @@ sed -i "s#http://localhost:3000#$LinkwardenURL#" /opt/node/linkwarden/.env
 sudo -u node bash << EOF
 (cd /opt/node/linkwarden; yarn prisma migrate deploy)
 pm2 install pm2-logrotate
-pm2 start yarn --name Linkwarden --cwd /opt/node/linkwarden -- start
+pm2 start yarn --name Linkwarden --cwd /opt/node/linkwarden -- concurrently:start
 pm2 save
-EOF
+EOF
--- a/CT-Files/linkwarden/Scripts/Init.sh
+++ b/CT-Files/linkwarden/Scripts/Init.sh
@@ -21,9 +21,11 @@ cd /opt/node/linkwarden
 npx playwright install --with-deps chromium
 rm -rf /root/.cache

+
 yarn install
-yarn prisma generate
-yarn build
+yarn prisma:generate
+yarn web:build
+yarn next build
 yarn cache clean
 apt clean

@@ -31,4 +33,4 @@ cd $startpath
 cp /opt/node/linkwarden/.env.sample /opt/node/linkwarden/.env
 chown node: -R /opt/node/linkwarden
 su -c "cd /opt/node/linkwarden; npx playwright install chromium" node
-mv /opt/Setup/Scripts/Update-linkwarden.sh /opt/Update-linkwarden.sh
+mv /opt/Setup/Scripts/Update-linkwarden.sh /opt/Update-linkwarden.sh
--- a/CT-Files/linkwarden/Scripts/Update-linkwarden.sh
+++ b/CT-Files/linkwarden/Scripts/Update-linkwarden.sh
@@ -6,17 +6,19 @@ if test "$CurLinkwardenVersion" = "$(cat /opt/linkwarden-Version)" ; then
    exit
 else
    echo 'Updating Linkwarden'
-sudo -u node bash << EOF
-    /usr/bin/pm2 stop Linkwarden
+
+sudo -u node /usr/bin/pm2 stop Linkwarden
    cd /opt/node/linkwarden
    git pull
    /usr/bin/yarn install
-    /usr/bin/yarn prisma generate
-    /usr/bin/yarn build
+    /usr/bin/yarn prisma:generate
+    /usr/bin/yarn web:build
+    /usr/bin/yarn next build
    /usr/bin/yarn cache clean
-    /usr/bin/yarn prisma migrate deploy
-    /usr/bin/pm2 start Linkwarden
-    npx playwright install chromium
-EOF
+    /usr/bin/yarn prisma:deploy
+    chown node:node -R /opt/node/linkwarden
+sudo -u node /usr/bin/pm2 start Linkwarden
+
+
    echo "$CurLinkwardenVersion" > /opt/linkwarden-Version
-fi
+fi
--- a/CT-Files/nextcloud/Scripts/Init.sh
+++ b/CT-Files/nextcloud/Scripts/Init.sh
@@ -7,7 +7,7 @@ rm -rf /etc/nginx/conf.d
 mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf

 #Setup PHP
-ash /opt/Setup/Scripts/PHPTool.sh -dv 83 nextcloud || exit 1
+ash /opt/Setup/Scripts/PHPTool.sh -d nextcloud || exit 1
 rm /opt/Setup/Scripts/PHPTool.sh


--- a/CT-Files/nginx/Configs/nginx.conf
+++ b/CT-Files/nginx/Configs/nginx.conf
@@ -37,8 +37,6 @@ http {
    ssl_ecdh_curve secp384r1;
    ssl_session_cache shared:le_nginx_SSL:1m;
    ssl_session_timeout 1440m;
-    ssl_stapling on;
-    ssl_stapling_verify on;
    ssl_prefer_server_ciphers on;
    ssl_protocols TLSv1.2 TLSv1.3;
    ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
--- a/CT-Files/nginx/Scripts/AddDomain.sh
+++ b/CT-Files/nginx/Scripts/AddDomain.sh
@@ -64,7 +64,7 @@ if $request; then
    service nginx reload

    #Enabling SSL
-    /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --nginx --ocsp --keylength 'ec-384' -d "$domain"
+    /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --nginx --keylength 'ec-384' -d "$domain"
    certsatus=$?
    
    if test $certsatus -eq 0
--- a/CT-Files/pihole/Configs/lighthttpd-redirect.conf
+++ b/CT-Files/pihole/Configs/lighthttpd-redirect.conf
@@ -1 +0,0 @@
-url.redirect = ("^/$" => "/admin" )
--- a/CT-Files/pihole/Configs/pihole.toml
+++ b/CT-Files/pihole/Configs/pihole.toml
@@ -0,0 +1,28 @@
+# Pi-hole configuration file (v6.1)
+# Encoding: UTF-8
+
+[dns]
+  upstreams = [
+    "9.9.9.9",
+    "149.112.112.112"
+  ] 
+  piholePTR = "HOSTNAME"
+
+  listeningMode = "SINGLE"
+
+  domainNeeded = true
+
+  [ntp.ipv4]
+    active = false
+
+  [ntp.ipv6]
+    active = false
+
+  [ntp.sync]
+    active = false
+
+    [ntp.sync.rtc]
+      utc = false
+      
+[webserver]
+  port = "80o,[::]:80o"
--- a/CT-Files/pihole/Configs/setupVars.conf
+++ b/CT-Files/pihole/Configs/setupVars.conf
@@ -1,7 +0,0 @@
-WEBPASSWORD=
-QUERY_LOGGING=true
-INSTALL_WEB=true
-DNSMASQ_LISTENING=single
-PIHOLE_DNS_1=192.168.2.1
-PIHOLE_DNS_2=192.168.2.1
-TEMPERATUREUNIT=C
--- a/CT-Files/pihole/Scripts/FirstRun.sh
+++ b/CT-Files/pihole/Scripts/FirstRun.sh
@@ -1,5 +1,17 @@
 #!/bin/bash
+read -p "IP for the upstream dns server: " UpStreamDNS1
+
+while true; do
+    read -p "Add seconndary upstream dns server Y/N? " yn
+    case $yn in
+        [Yy]* ) read -p "IP for second the upstream dns server: " UpStreamDNS2;break;;
+        [Nn]* ) UpStreamDNS2=$UpStreamDNS1;break;;
+        * ) echo "Please answer yes or no.";;
+    esac
+done
+
+sed -i "/upstreams = \[/,/\]/c\upstreams = [ \"$UpStreamDNS1\" , \"$UpStreamDNS2\" ]" /etc/pihole/pihole.toml
 #Finialize instaltation
 /etc/.pihole/automated\ install/basic-install.sh --reconfigure --unattended
 #Set password
-pihole -a -p
+pihole setpassword
--- a/CT-Files/pihole/Scripts/Init.sh
+++ b/CT-Files/pihole/Scripts/Init.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 mkdir -p /etc/pihole
-mv /opt/Setup/Configs/setupVars.conf /etc/pihole/setupVars.conf
-mv /opt/Setup/Configs/lighthttpd-redirect.conf /etc/lighttpd/conf-available/14-root-redirect.conf
-ln -s  ../conf-available/14-root-redirect.conf  /etc/lighttpd/conf-enabled/14-root-redirect.conf
+mv /opt/Setup/Configs/pihole.toml /etc/pihole/pihole.toml

 echo "DNSStubListener=no" >> /etc/systemd/resolved.conf
 ln -s /etc/systemd/system/pihole-FTL.service /etc/systemd/system/multi-user.target.wants/pihole-FTL.service
-curl -sSL https://install.pi-hole.net | bash /dev/stdin --unattended || true
+curl -sSL https://install.pi-hole.net | bash /dev/stdin --unattended || true
+
+rm -rf /opt/Setup/Configs
--- a/CT-Files/pihole/Scripts/PTKAppUpdate.sh
+++ b/CT-Files/pihole/Scripts/PTKAppUpdate.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 # Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
-/usr/local/bin/pihole -up
+/usr/local/bin/pihole updatePihole