From 78e1c37491f83d2c97305ca049545ae912cbb6de Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Sun, 3 Jul 2022 01:22:36 +0200
Subject: [PATCH] Fixed erros in multiple CT's Added fixes for: Pihole ,
 aptcacher, OmdaV3, mailbackup  and nginx

---
 CT-Build/Alpine.yaml                 | 1 +
 CT-Build/Debian.yaml                 | 8 ++++++++
 CT-Files/aptcacherng/Scripts/Init.sh | 2 +-
 CT-Files/mailbackup/Scripts/Init.sh  | 4 ++--
 CT-Files/nginx/Scripts/Init.sh       | 2 +-
 CT-Files/pihole/Scripts/Init.sh      | 2 +-
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml
index 293d359..47b60cb 100644
--- a/CT-Build/Alpine.yaml
+++ b/CT-Build/Alpine.yaml
@@ -534,6 +534,7 @@ packages:
     - php8-iconv
     - py3-pip
     - sudo
+    - git
     action: install
     variants:
     - mailbackup
diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml
index 34f5763..7a961f8 100644
--- a/CT-Build/Debian.yaml
+++ b/CT-Build/Debian.yaml
@@ -1042,6 +1042,7 @@ packages:
     - collabora
     - jellyfin
     - pihole
+    - omadaV3
     - docker
     - smb
     - tvheadend
@@ -1194,6 +1195,13 @@ packages:
     variants:
     - domoticz
 
+#OmadaV3 pkgs    
+  - packages:
+    - curl
+    action: install
+    variants:
+    - omadaV3
+
 #docker pkgs    
   - packages:
     - docker-ce
diff --git a/CT-Files/aptcacherng/Scripts/Init.sh b/CT-Files/aptcacherng/Scripts/Init.sh
index 4ae1dc9..d96238c 100644
--- a/CT-Files/aptcacherng/Scripts/Init.sh
+++ b/CT-Files/aptcacherng/Scripts/Init.sh
@@ -8,4 +8,4 @@ setcap 'cap_net_bind_service=+ep' /usr/sbin/apt-cacher-ng
 mv /opt/Setup/Configs/acng.conf /etc/apt-cacher-ng/acng.conf
 mv /opt/Setup/Scripts/UpdateMirrorList.sh /opt/UpdateMirrorList.sh
 #Enable apt-cacher-ng on startup
-ln -s /lib/systemd/system/apt-cacher-ng.service /etc/systemd/system/multi-user.target.wants/apt-cacher-ng.service
\ No newline at end of file
+ln -s /lib/systemd/system/apt-cacher-ng.service /etc/systemd/system/multi-user.target.wants/apt-cacher-ng.service || true
\ No newline at end of file
diff --git a/CT-Files/mailbackup/Scripts/Init.sh b/CT-Files/mailbackup/Scripts/Init.sh
index aef7cd6..5f76cbf 100644
--- a/CT-Files/mailbackup/Scripts/Init.sh
+++ b/CT-Files/mailbackup/Scripts/Init.sh
@@ -2,10 +2,10 @@
 #Get Resources
 git clone https://git.bprieshof.nl/Tools/MailBackup-sys.git /opt/Setup/MailBackup-sys
 CurrentVersion=$(curl -s https://api.github.com/repos/RainLoop/rainloop-webmail/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ")
-OfflineIMAPVer=$(curl -s https://api.github.com/repos/OfflineIMAP/offlineimap3/tags | grep 'name.*' |head -n 1 | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ")
+OfflineIMAPVer=$(curl -s https://api.github.com/repos/OfflineIMAP/offlineimap3/tags | grep 'name.*' |head -n 1 | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " " |tr -d :)
 echo $CurrentVersion > /opt/Setup/rainloop-installed
 curl -L --retry 7 --retry-delay 5  http://www.rainloop.net/repository/webmail/rainloop-community-latest.zip -o /opt/Setup/rlcl.zip || exit 1
-echo "$OfflineIMAPVer" > CT-Files/OfflineIMAP3-installed
+echo "$OfflineIMAPVer" > /opt/Setup/OfflineIMAP3-installed
 curl -L --retry 7 --retry-delay 5 https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/$OfflineIMAPVer.tar.gz -o /opt/Setup/olim3.tar.gz || exit 1
 
 #Install and configure using git.bprieshof.nl MailBackup-sys
diff --git a/CT-Files/nginx/Scripts/Init.sh b/CT-Files/nginx/Scripts/Init.sh
index ee9a8f6..2cc8405 100644
--- a/CT-Files/nginx/Scripts/Init.sh
+++ b/CT-Files/nginx/Scripts/Init.sh
@@ -1,6 +1,6 @@
 #!/bin/ash
 #Get Resources
-curl -L --retry 7 --retry-delay 5 https://codeload.github.com/acmesh-official/acme.sh/tar.gz/master -o /opt/Setup/Fileacmesh.tar.gz || exit 1
+curl -L --retry 7 --retry-delay 5 https://codeload.github.com/acmesh-official/acme.sh/tar.gz/master -o /opt/Setup/acmesh.tar.gz || exit 1
 
 #Configure Nginx
 mkdir -p /etc/nginx/sites-available /etc/nginx/sites-enabled /etc/nginx/snippets /etc/nginx/modules-available /etc/nginx/modules-enabled /etc/nginx/snippets/
diff --git a/CT-Files/pihole/Scripts/Init.sh b/CT-Files/pihole/Scripts/Init.sh
index 74c06bb..f44e877 100644
--- a/CT-Files/pihole/Scripts/Init.sh
+++ b/CT-Files/pihole/Scripts/Init.sh
@@ -3,4 +3,4 @@ mkdir -p /etc/pihole
 mv /opt/Setup/Configs/setupVars.conf /etc/pihole/setupVars.conf
 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
\ No newline at end of file
+curl -sSL https://install.pi-hole.net | bash /dev/stdin --unattended || true
\ No newline at end of file