From ce7670eccdd778601c6102a632b91eb135846844 Mon Sep 17 00:00:00 2001
From: thomas <thomas@lgy.fr>
Date: Sun, 16 Oct 2022 18:42:12 +0200
Subject: [PATCH] fix

---
 make                                          |  5 +--
 src/2sman-client/DEBIAN/control               |  2 +-
 src/2smanc/DEBIAN/changelog                   |  5 +++
 src/2smanc/DEBIAN/conffiles                   |  2 ++
 src/2smanc/DEBIAN/control                     |  8 +++++
 .../etc/2smanc/config/check_process.conf      |  0
 src/2smanc/etc/2smanc/enable/check_process    |  1 +
 src/2smanc/etc/2smanc/enable/diskspace        |  1 +
 src/2smanc/etc/2smanc/enable/loadavg          |  1 +
 src/2smanc/etc/cron.d/2smanc                  |  3 ++
 src/2smanc/etc/default/2smanc                 |  2 ++
 src/2smanc/usr/bin/2smanc                     | 25 +++++++++++++
 .../usr/share/2smanc/scripts/check_process    |  2 ++
 src/2smanc/usr/share/2smanc/scripts/date      |  1 +
 src/2smanc/usr/share/2smanc/scripts/diskspace |  2 ++
 src/2smanc/usr/share/2smanc/scripts/dpkg      |  2 ++
 src/2smanc/usr/share/2smanc/scripts/loadavg   |  2 ++
 .../share/2smanc/scripts/systemd-detect-virt  |  1 +
 src/amp-base/DEBIAN/control                   |  2 +-
 src/amp-base/etc/apt/apt.conf.d/01acng        |  3 ++
 src/amp-prefered-config/DEBIAN/control        |  2 +-
 src/amp-proxmox-utils/DEBIAN/control          |  2 +-
 .../usr/bin/amp-proxmox-lxc-upgrade           | 10 ++++++
 .../usr/bin/lxc-debootstrap-image-create      | 36 +++++++++++--------
 src/amp-upgrade-airsonic/DEBIAN/control       |  2 +-
 src/amp-upgrade-baikal/DEBIAN/control         |  2 +-
 src/amp-upgrade-bitwardenrs/DEBIAN/control    |  2 +-
 src/amp-upgrade-ejabberd/DEBIAN/control       |  2 +-
 src/amp-upgrade-element-web/DEBIAN/control    |  2 +-
 src/amp-upgrade-golang/DEBIAN/control         |  2 +-
 src/amp-upgrade-gotify/DEBIAN/control         |  2 +-
 src/amp-upgrade-phpmyadmin/DEBIAN/control     |  2 +-
 src/amp-upgrade-roundcube/DEBIAN/control      |  2 +-
 src/amp-upgrade-unifi/DEBIAN/control          |  2 +-
 src/amp-webdav/DEBIAN/control                 |  2 +-
 src/logveillance/DEBIAN/control               |  2 +-
 36 files changed, 109 insertions(+), 35 deletions(-)
 create mode 100644 src/2smanc/DEBIAN/changelog
 create mode 100644 src/2smanc/DEBIAN/conffiles
 create mode 100644 src/2smanc/DEBIAN/control
 create mode 100644 src/2smanc/etc/2smanc/config/check_process.conf
 create mode 120000 src/2smanc/etc/2smanc/enable/check_process
 create mode 120000 src/2smanc/etc/2smanc/enable/diskspace
 create mode 120000 src/2smanc/etc/2smanc/enable/loadavg
 create mode 100755 src/2smanc/etc/cron.d/2smanc
 create mode 100644 src/2smanc/etc/default/2smanc
 create mode 100755 src/2smanc/usr/bin/2smanc
 create mode 100755 src/2smanc/usr/share/2smanc/scripts/check_process
 create mode 100755 src/2smanc/usr/share/2smanc/scripts/date
 create mode 100755 src/2smanc/usr/share/2smanc/scripts/diskspace
 create mode 100755 src/2smanc/usr/share/2smanc/scripts/dpkg
 create mode 100755 src/2smanc/usr/share/2smanc/scripts/loadavg
 create mode 100755 src/2smanc/usr/share/2smanc/scripts/systemd-detect-virt
 create mode 100644 src/amp-base/etc/apt/apt.conf.d/01acng

diff --git a/make b/make
index 8739032..abde02b 100755
--- a/make
+++ b/make
@@ -13,7 +13,4 @@ NEW_VERSION=$(echo $VERSION | awk 'BEGIN { FS="." } { $2++;  if ($2 > 99) { $2=0
 
 sed -i -e "s/$(echo $VERSION)/$(echo $NEW_VERSION)/" src/$PROJECT/DEBIAN/control
 
-fakeroot dpkg-deb -Z gzip --build src/$PROJECT alldebfiles/$PROJECT.deb
-reprepro --ask-passphrase -Vb repository/ remove tools ${PROJECT%.*} 
-reprepro --ask-passphrase -Vb repository/ includedeb tools alldebfiles/$PROJECT.deb
-rsync --delete -av -e "ssh -A -J lgy.fr " repository/* deb.net.lgy.fr:/var/www/html/
+fakeroot dpkg-deb -Z gzip --build src/$PROJECT alldebfiles/${PROJECT}_${NEW_VERSION}.deb
\ No newline at end of file
diff --git a/src/2sman-client/DEBIAN/control b/src/2sman-client/DEBIAN/control
index 4982b3a..531b312 100644
--- a/src/2sman-client/DEBIAN/control
+++ b/src/2sman-client/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: 2sman-client
-Version: 1.04
+Version: 1.07
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/2smanc/DEBIAN/changelog b/src/2smanc/DEBIAN/changelog
new file mode 100644
index 0000000..f46ecff
--- /dev/null
+++ b/src/2smanc/DEBIAN/changelog
@@ -0,0 +1,5 @@
+2smanc (0.1) stable; urgency=low
+
+  * Create
+
+ -- Legay Thomas <thomas@syngate.fr>  mar. 28 avril 2020 10:55
diff --git a/src/2smanc/DEBIAN/conffiles b/src/2smanc/DEBIAN/conffiles
new file mode 100644
index 0000000..e591bcd
--- /dev/null
+++ b/src/2smanc/DEBIAN/conffiles
@@ -0,0 +1,2 @@
+/etc/default/2smanc
+/etc/2smanc/config/check_process.conf
diff --git a/src/2smanc/DEBIAN/control b/src/2smanc/DEBIAN/control
new file mode 100644
index 0000000..b46f8ba
--- /dev/null
+++ b/src/2smanc/DEBIAN/control
@@ -0,0 +1,8 @@
+Package: 2smanc
+Version: 0.19
+Section: base
+Priority: optional
+Architecture: all
+Depends: wget, ca-certificates, jq
+Maintainer: Thomas Legay <thomas@syngate.fr>
+Description: Package 2smanc
diff --git a/src/2smanc/etc/2smanc/config/check_process.conf b/src/2smanc/etc/2smanc/config/check_process.conf
new file mode 100644
index 0000000..e69de29
diff --git a/src/2smanc/etc/2smanc/enable/check_process b/src/2smanc/etc/2smanc/enable/check_process
new file mode 120000
index 0000000..c5faaec
--- /dev/null
+++ b/src/2smanc/etc/2smanc/enable/check_process
@@ -0,0 +1 @@
+/usr/share/2smanc/scripts/check_process
\ No newline at end of file
diff --git a/src/2smanc/etc/2smanc/enable/diskspace b/src/2smanc/etc/2smanc/enable/diskspace
new file mode 120000
index 0000000..782b6b3
--- /dev/null
+++ b/src/2smanc/etc/2smanc/enable/diskspace
@@ -0,0 +1 @@
+/usr/share/2smanc/scripts/diskspace
\ No newline at end of file
diff --git a/src/2smanc/etc/2smanc/enable/loadavg b/src/2smanc/etc/2smanc/enable/loadavg
new file mode 120000
index 0000000..2d68435
--- /dev/null
+++ b/src/2smanc/etc/2smanc/enable/loadavg
@@ -0,0 +1 @@
+/usr/share/2smanc/scripts/loadavg
\ No newline at end of file
diff --git a/src/2smanc/etc/cron.d/2smanc b/src/2smanc/etc/cron.d/2smanc
new file mode 100755
index 0000000..647412b
--- /dev/null
+++ b/src/2smanc/etc/cron.d/2smanc
@@ -0,0 +1,3 @@
+SHELL=/bin/bash
+PATH=/usr/bin:/bin/
+*/5 * * * * root sleep ${RANDOM:0:1}s ; /usr/bin/2smanc run
diff --git a/src/2smanc/etc/default/2smanc b/src/2smanc/etc/default/2smanc
new file mode 100644
index 0000000..fc39212
--- /dev/null
+++ b/src/2smanc/etc/default/2smanc
@@ -0,0 +1,2 @@
+GOTIFY=
+TOKEN=
diff --git a/src/2smanc/usr/bin/2smanc b/src/2smanc/usr/bin/2smanc
new file mode 100755
index 0000000..1ec09dc
--- /dev/null
+++ b/src/2smanc/usr/bin/2smanc
@@ -0,0 +1,25 @@
+#!/bin/bash
+. /etc/default/2smanc
+
+[ "$TOKEN" == "" ]  && exit
+[ "$GOTIFY" == "" ] && exit
+
+case $1 in 
+	run)
+		[ "$(/usr/bin/find /etc/2smanc/enable/ -type l,f | wc -l)" -eq 0 ] && exit
+		/usr/bin/wget "${GOTIFY}/message?token=${TOKEN}" --post-data="message=$(/usr/bin/find /etc/2smanc/enable/ -type f,l -exec {} \;| /usr/bin/jq -sr @uri)" -qO - > /dev/null	;;
+	list)
+		ls /usr/share/2smanc/scripts/
+	;;
+	active)
+		ls /etc/2smanc/enable/
+	;;
+	enable)
+		[ -e "/usr/share/2smanc/scripts/$2" ] && ln -s "/usr/share/2smanc/scripts/$2" "/etc/2smanc/enable/$2" || echo "scripts do not exists in /usr/share/2smanc/scripts/"
+	;;
+	disable)
+		rm -fr  /etc/2smanc/enable/$2
+	;;
+	*)
+	echo "2smanc [list|active|run] [enable|disable] <script>"
+esac
diff --git a/src/2smanc/usr/share/2smanc/scripts/check_process b/src/2smanc/usr/share/2smanc/scripts/check_process
new file mode 100755
index 0000000..94ecb5d
--- /dev/null
+++ b/src/2smanc/usr/share/2smanc/scripts/check_process
@@ -0,0 +1,2 @@
+#!/bin/bash
+cat /etc/2smanc/config/check_process.conf | awk 'BEGIN {printf "{\"check_process\":[" }{ if(a) printf","; print "{\""$1"\":" ;  system("ps -C "$1" -o pid | tail -n +2 | wc -l");print "}" ; a++ }END {print"]}";}' | jq
diff --git a/src/2smanc/usr/share/2smanc/scripts/date b/src/2smanc/usr/share/2smanc/scripts/date
new file mode 100755
index 0000000..5b5beec
--- /dev/null
+++ b/src/2smanc/usr/share/2smanc/scripts/date
@@ -0,0 +1 @@
+echo { \"date\" : { \"date\" : $(date +%s)}}
diff --git a/src/2smanc/usr/share/2smanc/scripts/diskspace b/src/2smanc/usr/share/2smanc/scripts/diskspace
new file mode 100755
index 0000000..c95e50d
--- /dev/null
+++ b/src/2smanc/usr/share/2smanc/scripts/diskspace
@@ -0,0 +1,2 @@
+#!/bin/bash
+df -h | tail -n +2 | awk 'BEGIN {printf "{\"diskspace\":[" }{ if(a) printf","; print "{\"mount\":\"" $6 "\",\"size\":\"" $2 "\",\"used\":\"" $3 "\",\"avail\":\"" $4 "\",\"use\":\"" $5 "\"}"; a++; }END {print"]}";}'
diff --git a/src/2smanc/usr/share/2smanc/scripts/dpkg b/src/2smanc/usr/share/2smanc/scripts/dpkg
new file mode 100755
index 0000000..f778202
--- /dev/null
+++ b/src/2smanc/usr/share/2smanc/scripts/dpkg
@@ -0,0 +1,2 @@
+#!/bin/bash
+dpkg -l | tail -n +6 | awk 'BEGIN {printf "{\"dpkg\":[" }{ if(a) printf","; print "{\"status\":\"" $1 "\",\"name\":\"" $2 "\",\"version\":\"" $3"\"}"; a++; }END {print"]}";}'
diff --git a/src/2smanc/usr/share/2smanc/scripts/loadavg b/src/2smanc/usr/share/2smanc/scripts/loadavg
new file mode 100755
index 0000000..b2f68ec
--- /dev/null
+++ b/src/2smanc/usr/share/2smanc/scripts/loadavg
@@ -0,0 +1,2 @@
+#!/bin/bash
+cat /proc/loadavg | awk '{printf"{\"loadavg\":{\"1\":"$1",\"5\":\"$2\",\"15\":"$3",\"process\":"$5"}}"}'
diff --git a/src/2smanc/usr/share/2smanc/scripts/systemd-detect-virt b/src/2smanc/usr/share/2smanc/scripts/systemd-detect-virt
new file mode 100755
index 0000000..11f1402
--- /dev/null
+++ b/src/2smanc/usr/share/2smanc/scripts/systemd-detect-virt
@@ -0,0 +1 @@
+echo { \"systemd-detect-virt\" : { \"systemd-detect-virt\" : $(systemd-detect-virt)}}
diff --git a/src/amp-base/DEBIAN/control b/src/amp-base/DEBIAN/control
index 222fbc4..497774b 100644
--- a/src/amp-base/DEBIAN/control
+++ b/src/amp-base/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-base
-Version: 1.18
+Version: 1.21
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/amp-base/etc/apt/apt.conf.d/01acng b/src/amp-base/etc/apt/apt.conf.d/01acng
new file mode 100644
index 0000000..4ca708d
--- /dev/null
+++ b/src/amp-base/etc/apt/apt.conf.d/01acng
@@ -0,0 +1,3 @@
+Acquire::http {
+Proxy "http://apt-cacher.net.lgy.fr:3142";
+};
diff --git a/src/amp-prefered-config/DEBIAN/control b/src/amp-prefered-config/DEBIAN/control
index a5819f0..8940b2a 100644
--- a/src/amp-prefered-config/DEBIAN/control
+++ b/src/amp-prefered-config/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-prefered-config
-Version: 1.04
+Version: 1.06
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/amp-proxmox-utils/DEBIAN/control b/src/amp-proxmox-utils/DEBIAN/control
index c101fcd..6026a2f 100644
--- a/src/amp-proxmox-utils/DEBIAN/control
+++ b/src/amp-proxmox-utils/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-proxmox-utils
-Version: 1.14
+Version: 1.22
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/amp-proxmox-utils/usr/bin/amp-proxmox-lxc-upgrade b/src/amp-proxmox-utils/usr/bin/amp-proxmox-lxc-upgrade
index b3fee08..2360494 100755
--- a/src/amp-proxmox-utils/usr/bin/amp-proxmox-lxc-upgrade
+++ b/src/amp-proxmox-utils/usr/bin/amp-proxmox-lxc-upgrade
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 for tmp in $(pct list | grep run | cut -c 1-3)
 do
+<<<<<<< HEAD
         echo ------------------------------------------------------
         echo  $tmp
         echo ------------------------------------------------------
@@ -9,4 +10,13 @@ do
 
         pct exec $tmp amp-full-upgrade
         pct exec $tmp apt clean
+=======
+	echo ------------------------------------------------------
+	echo  $tmp
+	echo ------------------------------------------------------ 
+	pct exec $tmp wget -o /tmp/install.sh https://deb.lgy.fr/install.sh
+	pct exec $tmp bash  /tmp/install.sh
+	pct exec $tmp amp-full-upgrade
+	pct exec $tmp apt clean
+>>>>>>> d281ea2 (update)
 done
diff --git a/src/amp-proxmox-utils/usr/bin/lxc-debootstrap-image-create b/src/amp-proxmox-utils/usr/bin/lxc-debootstrap-image-create
index 61f8f04..561271e 100755
--- a/src/amp-proxmox-utils/usr/bin/lxc-debootstrap-image-create
+++ b/src/amp-proxmox-utils/usr/bin/lxc-debootstrap-image-create
@@ -3,21 +3,27 @@ SRC_DEBOOTSTRAP=/usr/share/debootstrap/scripts
 IMAGE=$1
 URL=$2
 TARBALL=$1-$(date +%Y%m%d).tar.gz
+
 if [ -f $SRC_DEBOOTSTRAP/$IMAGE ] ;
-then 
-	TARGET=$(tempfile)
-	rm $TARGET
-	mkdir $TARGET
-	echo create rootfs in temporary folder $TARGET
-	debootstrap $IMAGE $TARGET $URL > /dev/null
-	echo create archive $TARBALL
-	tar -C $TARGET -zcvf $TARBALL . > /dev/null
-	echo Remove temporary folder
-	rm -fr $TARGET
-	chmod ugo+r $TARBALL
-	echo lxc image available in $TARBALL
+then
+        TARGET=$(mktemp)
+        rm $TARGET
+        mkdir $TARGET
+        echo create rootfs in temporary folder $TARGET
+        debootstrap $IMAGE $TARGET $URL > /dev/null
+        cat <<-EOF > $TARGET/etc/apt/apt.conf.d/99aptlight
+                APT::Install-Recommends "false";
+                APT::Install-Suggests "false";
+EOF
+        chroot $TARGET /usr/bin/apt clean
+        echo create archive $TARBALL
+        tar -C $TARGET -zcvf $TARBALL . > /dev/null
+        echo Remove temporary folder
+        rm -fr $TARGET
+        chmod ugo+r $TARBALL
+        echo lxc image available in $TARBALL
 else
-	echo $(basename $0) \<version\> [\<url\>]
-	echo $(basename $0) focal http://archive.ubuntu.com/ubuntu
-	ls $SRC_DEBOOTSTRAP
+        echo $(basename $0) \<version\> [\<url\>]
+        echo $(basename $0) focal http://archive.ubuntu.com/ubuntu
+        ls $SRC_DEBOOTSTRAP
 fi
diff --git a/src/amp-upgrade-airsonic/DEBIAN/control b/src/amp-upgrade-airsonic/DEBIAN/control
index f9e69fa..175c313 100644
--- a/src/amp-upgrade-airsonic/DEBIAN/control
+++ b/src/amp-upgrade-airsonic/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-upgrade-airsonic
-Version: 1.01
+Version: 1.03
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/amp-upgrade-baikal/DEBIAN/control b/src/amp-upgrade-baikal/DEBIAN/control
index f6f0f06..e4b19a3 100644
--- a/src/amp-upgrade-baikal/DEBIAN/control
+++ b/src/amp-upgrade-baikal/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-upgrade-baikal
-Version: 1.01
+Version: 1.03
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/amp-upgrade-bitwardenrs/DEBIAN/control b/src/amp-upgrade-bitwardenrs/DEBIAN/control
index 8995904..664182f 100644
--- a/src/amp-upgrade-bitwardenrs/DEBIAN/control
+++ b/src/amp-upgrade-bitwardenrs/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-upgrade-bitwardenrs
-Version: 1.02
+Version: 1.04
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/amp-upgrade-ejabberd/DEBIAN/control b/src/amp-upgrade-ejabberd/DEBIAN/control
index 20b920a..8f23b37 100644
--- a/src/amp-upgrade-ejabberd/DEBIAN/control
+++ b/src/amp-upgrade-ejabberd/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-upgrade-ejabberd
-Version: 1.05
+Version: 1.07
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/amp-upgrade-element-web/DEBIAN/control b/src/amp-upgrade-element-web/DEBIAN/control
index 8f34600..b89cd73 100644
--- a/src/amp-upgrade-element-web/DEBIAN/control
+++ b/src/amp-upgrade-element-web/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-upgrade-element-web
-Version: 1.02
+Version: 1.04
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/amp-upgrade-golang/DEBIAN/control b/src/amp-upgrade-golang/DEBIAN/control
index 1d67d2b..2fd312e 100644
--- a/src/amp-upgrade-golang/DEBIAN/control
+++ b/src/amp-upgrade-golang/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-upgrade-golang
-Version: 1.01
+Version: 1.03
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/amp-upgrade-gotify/DEBIAN/control b/src/amp-upgrade-gotify/DEBIAN/control
index 7543b3f..8ace55d 100644
--- a/src/amp-upgrade-gotify/DEBIAN/control
+++ b/src/amp-upgrade-gotify/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-upgrade-gotify
-Version: 1.02
+Version: 1.04
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/amp-upgrade-phpmyadmin/DEBIAN/control b/src/amp-upgrade-phpmyadmin/DEBIAN/control
index ba675f5..aa03298 100644
--- a/src/amp-upgrade-phpmyadmin/DEBIAN/control
+++ b/src/amp-upgrade-phpmyadmin/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-upgrade-phpmyadmin
-Version: 1.02
+Version: 1.04
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/amp-upgrade-roundcube/DEBIAN/control b/src/amp-upgrade-roundcube/DEBIAN/control
index ac1d5ef..e1dd744 100644
--- a/src/amp-upgrade-roundcube/DEBIAN/control
+++ b/src/amp-upgrade-roundcube/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-upgrade-roundcube
-Version: 1.01
+Version: 1.03
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/amp-upgrade-unifi/DEBIAN/control b/src/amp-upgrade-unifi/DEBIAN/control
index 0e44431..44e02dd 100644
--- a/src/amp-upgrade-unifi/DEBIAN/control
+++ b/src/amp-upgrade-unifi/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-upgrade-unifi
-Version: 1.01
+Version: 1.03
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/amp-webdav/DEBIAN/control b/src/amp-webdav/DEBIAN/control
index ac2dea5..f665b75 100644
--- a/src/amp-webdav/DEBIAN/control
+++ b/src/amp-webdav/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: amp-webdav
-Version: 1.01
+Version: 1.03
 Section: base
 Priority: optional
 Architecture: all
diff --git a/src/logveillance/DEBIAN/control b/src/logveillance/DEBIAN/control
index 90fcaee..09ee0be 100644
--- a/src/logveillance/DEBIAN/control
+++ b/src/logveillance/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: logveillance
-Version: 1.17
+Version: 1.19
 Section: base
 Priority: optional
 Architecture: all