README.MD

@@ -57,7 +57,6 @@ To enter in temporary filesystem
   - [mautrix-syncproxy and mautrix-wsproxy](#mautrix-syncproxy-and-mautrix-wsproxy) ([site](https://docs.mau.fi/bridges/go/imessage/android/setup.html)) ([src](https://github.com/mautrix/syncproxy)) ([src](https://github.com/mautrix/wsproxy))
   - [mautrix-whatsapp](#mautrix-whatsapp) ([site](https://docs.mau.fi/bridges/go/whatsapp/index.html)) ([src](https://github.com/mautrix/whatsapp))
   - [metabase](#metabase)  ([site](https://www.metabase.com/)) ([src](https://github.com/metabase/metabase))
-  - [roundcubemail](#roundcubemail) ([site](https://roundcube.net/)) ([src](https://github.com/roundcube/roundcubemail))
   - [rss-bridge](#rss-bridge) ([site](https://github.com/rss-bridge/rss-bridge)) ([src](https://github.com/RSS-Bridge/rss-bridge))
   - [rustdesk-server](#rustdesk-server) ([site](https://rustdesk.com/)) ([src](https://github.com/rustdesk/rustdesk-server))
   - [tt-rss](#tt-rss) ([site](https://tt-rss.org/)) ([src](https://git.tt-rss.org/fox/tt-rss))
@@ -254,25 +253,6 @@ systemctl enable --now metabase
 #configuration with http://<ip>:3000
 ```
 
-#### roundcubemail
-
-```bash
-apt install -y wget ca-certificates
-wget -qO - https://deb.lgy.fr/install.sh | bash
-apt-get update
-apt install roundcubemail
-
-# sample configuration for apache2 + vhost
-
-cp /usr/share/doc/roundcubemail/apache2-roundcubemail.conf /etc/apache2/sites-available/roundcubemail.conf
-a2ensite roundcubemail
-
-# edit /etc/apache2/sites-available/roundcubemail.conf
-# edit /etc/roundcubemail/config.inc.php
-
-systemctl restart apache2
-```
-
 #### rss-bridge
 
 ```bash

ressources/roundcubemail/debmaker

@@ -1,45 +0,0 @@
-#!/bin/bash
-
-VERSION=1.6.0
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
-APP=roundcubemail
-DEPOT=https://github.com/roundcube/roundcubemail.git
-GIT_VERSION=${VERSION}
-DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=4
-
-STEP="minimum_package envinit default_prebuild build makedeb"
-
-envinit() {
-	apt-get update
-	apt-get dist-upgrade -y
-	apt-get install -y --no-install-recommends make curl npm nodejs jq php-xml php-pear php-mbstring unzip
-}
-
-build() {
-	cd /tmp/${APP}
-	rm roundcubemail-*-git-complete.tar.gz
-	PATH=$PATH:/tmp/${APP}/node_modules/.bin/
-	sed 's/GITREMOTE=git/GITREMOTE=https/' Makefile -i
-	sed "s/git clone --branch=\$(GITBRANCH)/git clone -b ${GIT_VERSION}/" Makefile -i
-	make
-}
-
-makedeb(){
-	PATH_DEB=/tmp/src/rootfs
-
-	tar -zxf /tmp/${APP}/roundcubemail-*-git-complete.tar.gz --strip-components=1 -C ${PATH_DEB}/usr/share/roundcubemail/
-	cp ${PATH_DEB}/usr/share/roundcubemail/config/config.inc.php.sample ${PATH_DEB}/etc/roundcubemail/config.inc.php
-	mv ${PATH_DEB}/usr/share/roundcubemail/{CHANGELOG.md,INSTALL,LICENSE,README.md,SECURITY.md,UPGRADING} ${PATH_DEB}/usr/share/doc/roundcubemail/
-	mv ${PATH_DEB}/usr/share/roundcubemail/{temp,logs} ${PATH_DEB}/var/lib/roundcubemail/
-
-	ln -s /var/lib/roundcubemail/temp ${PATH_DEB}/usr/share/roundcubemail/temp
-	ln -s /var/lib/roundcubemail/logs ${PATH_DEB}/usr/share/roundcubemail/logs
-	ln -s /etc/roundcubemail/config.inc.php ${PATH_DEB}/usr/share/roundcubemail/config/config.inc.php
-
-	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
-	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
-}

ressources/roundcubemail/rootfs/DEBIAN/conffiles

@@ -1 +0,0 @@
-/etc/roundcubemail/config.inc.php

ressources/roundcubemail/rootfs/DEBIAN/control

@@ -1,8 +0,0 @@
-Package: roundcubemail
-Version: %VERSION%
-Section: base
-Priority: optional
-Architecture: all
-Depends: php-common, php-xml, php-json, php-gd, php-mbstring, php-xml, php-tidy, php-curl, php-tokenizer, php-bcmath, php-intl, php-fpm, php-sqlite3, php-pgsql, php-mysql
-Maintainer: Thomas Legay <thomas@lgy.fr>
-Description: roundcubemail

ressources/roundcubemail/rootfs/DEBIAN/postinst

@@ -1,2 +0,0 @@
-#!/bin/bash
-chown -R www-data:www-data /var/lib/roundcubemail/

ressources/roundcubemail/rootfs/etc/roundcubemail/.gitkeep

@@ -1 +0,0 @@
-

ressources/roundcubemail/rootfs/usr/share/doc/roundcubemail/apache2-roundcubemail.conf

@@ -1,15 +0,0 @@
-<VirtualHost *:80>
-        servername roundcube.domain.com
-        ServerAdmin admin@domain.com
-
-        DocumentRoot /usr/share/roundcubemail/
-        Protocols h2c http/1.1
-
-	<directory /usr/share/roundcubemail/>
-		Options FollowSymLinks
-		AllowOverride None
-		Require all granted
-	</directory>
-</VirtualHost>
-
-

ressources/roundcubemail/rootfs/usr/share/roundcubemail/.gitkeep

@@ -1 +0,0 @@
-

ressources/roundcubemail/rootfs/var/lib/roundcubemail/.gitkeep

@@ -1 +0,0 @@
-

ressources/zigbee2mqtt/debmaker

@@ -11,13 +11,23 @@ DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=2
 
-STEP="minimum_package envinit default_prebuild build makedeb"
+STEP="envinit prebuild build makedeb"
 
 envinit() {
-	configure_depot_nodejs
 	apt-get update
+	if [ $(dpkg -l | grep -e 'ii nodejs' | wc -l) -eq 1 ];
+	then
 		apt-get dist-upgrade -y
-	apt install -y --no-install-recommends nodejs make g++ gcc
+	else
+		apt install -y --no-install-recommends wget ca-certificates nodejs npm git make g++ gcc fakeroot dpkg
+	fi
+}
+
+prebuild(){
+	[ -e /tmp/git ] && rm -fr /tmp/git
+	[ -e /tmp/${APP} ] || mkdir /tmp/${APP}
+	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/git
+	cp -r /tmp/git/. /tmp/${APP}
 }
 
 build() {

ressources/zigbee2mqtt/rootfs/DEBIAN/postinst

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 id zigbee2mqtt &> /dev/null || useradd zigbee2mqtt -r -s /bin/false -md /var/lib/zigbee2mqtt
-chown -R zigbee2mqtt:zigbee2mqtt /var/lib/zigbee2mqtt/
+chown zigbee2mqtt:zigbee2mqtt /var/lib/zigbee2mqtt/