thomas/debmaker
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix flame package

Browse source 
upgrade version of adguardhome element-web mautrix-whatsapp
use new debian packaging process for mautrix-whatsapp
This commit is contained in:
thomas 2022-04-19 01:23:36 +02:00
parent 8817ddba0a
commit 6148b1fa75
17 changed files with 32 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.MD
View file

@ -110,6 +110,7 @@ systemctl restart apache2
```bash ```bash
apt install -y wget ca-certificates apt install -y wget ca-certificates
wget -qO - https://deb.lgy.fr/install.sh | bash wget -qO - https://deb.lgy.fr/install.sh | bash
wget -qO - https://deb.nodesource.com/setup_16.x | bash
apt-get update apt-get update
apt-get install -y flame apt-get install -y flame
@ -198,7 +199,7 @@ apt install -y wget ca-certificates
wget -qO - https://deb.lgy.fr/install.sh | bash wget -qO - https://deb.lgy.fr/install.sh | bash
wget -qO - https://deb.nodesource.com/setup_16.x | bash wget -qO - https://deb.nodesource.com/setup_16.x | bash
apt-get update apt-get update
apt-get install -y joplin-server apt-get install -y joplin-server
#Edit /etc/default/joplin-server #Edit /etc/default/joplin-server

5
lib/function.sh
View file

@ -1,4 +1,7 @@
#!/bin/bash #!/bin/bash
LANGUAGE=C
LC_ALL=C
LANG=C
DEBOOTSTRAP_DIR=cache/debootstrap/ DEBOOTSTRAP_DIR=cache/debootstrap/
MOUNT_PATH=/mnt/debmaker MOUNT_PATH=/mnt/debmaker
@ -74,6 +77,8 @@ debmaker_umount_proc_sys(){
debmaker_chroot() { debmaker_chroot() {
OPEN_FILE=cache/$2${APP} OPEN_FILE=cache/$2${APP}
zdebmaker_getDep zdebmaker_getDep
[ -f cache/${APP} ] || zdebmaker_createAppOS
zdebmaker_inject
debmaker_mount_proc_sys ${OPEN_FILE} ${MOUNT_PATH}/${APP}/ debmaker_mount_proc_sys ${OPEN_FILE} ${MOUNT_PATH}/${APP}/
sudo chroot ${MOUNT_PATH}/${APP}/ sudo chroot ${MOUNT_PATH}/${APP}/
debmaker_umount_proc_sys ${MOUNT_PATH}/${APP}/ debmaker_umount_proc_sys ${MOUNT_PATH}/${APP}/

5
ressources/adguardhome/debmaker
View file

@ -1,14 +1,13 @@
#!/bin/bash #!/bin/bash
VERSION=0.108.0-b.5 VERSION=0.108.0-b.6
RELEASE=1
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh
APP=adguardhome APP=adguardhome
DEPOT=https://github.com/AdguardTeam/AdGuardHome.git DEPOT=https://github.com/AdguardTeam/AdGuardHome.git
GIT_VERSION=v${VERSION} GIT_VERSION=v${VERSION}
DEB_VERSION=${VERSION}-${RELEASE} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
DEBIAN_VERSION_CODENAME=bullseye DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=4 IMAGE_SIZE=4
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"

2
ressources/element-web/debmaker
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
VERSION=1.10.9 VERSION=1.10.10
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh

1
ressources/flame/debmaker
View file

@ -44,6 +44,7 @@ makedeb(){
PATH_DEB=/tmp/src/rootfs PATH_DEB=/tmp/src/rootfs
cp -fr /tmp/${APP}/* ${PATH_DEB}/usr/share/flame/ cp -fr /tmp/${APP}/* ${PATH_DEB}/usr/share/flame/
cp -fr /tmp/${APP}/.env ${PATH_DEB}/usr/share/flame/
mv ${PATH_DEB}/usr/share/flame/data ${PATH_DEB}/var/lib/${APP}/data mv ${PATH_DEB}/usr/share/flame/data ${PATH_DEB}/var/lib/${APP}/data
mv ${PATH_DEB}/usr/share/flame/public ${PATH_DEB}/var/lib/${APP}/public mv ${PATH_DEB}/usr/share/flame/public ${PATH_DEB}/var/lib/${APP}/public
ln -fs /var/lib/${APP}/data ${PATH_DEB}/usr/share/${APP}/data ln -fs /var/lib/${APP}/data ${PATH_DEB}/usr/share/${APP}/data

4
ressources/flame/rootfs/DEBIAN/control
View file

@ -4,5 +4,5 @@ Section: base
Priority: optional Priority: optional
Architecture: all Architecture: all
Depends:nodejs Depends:nodejs
Maintainer: Thomas Legay <thomas@syngate.fr> Maintainer: Thomas Legay <thomas@lgy.fr>
Description: flame Description: Flame is self-hosted startpage for your server. Its design is inspired (heavily) by SUI. Flame is very easy to setup and use. With built-in editors, it allows you to setup your very own application hub in no time - no file editing necessary.

1
ressources/flame/rootfs/etc/default/flame
View file

@ -1,5 +1,4 @@
PORT=5005 PORT=5005
NODE_ENV=production NODE_ENV=production
VERSION=2.3.0
PASSWORD=flame_password PASSWORD=flame_password
SECRET=e02eb43d69953658c6d07311d6313f2d4467672cb881f96b29368ba1f3f4da4b SECRET=e02eb43d69953658c6d07311d6313f2d4467672cb881f96b29368ba1f3f4da4b

7
ressources/joplin/debmaker
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
GIT_VERSION=v2.8.1 GIT_VERSION=v2.8.2
DEB_VERSION_DESKTOP=2.8.1-$(date +%Y%m%d%H%M) DEB_VERSION_DESKTOP=2.8.2-$(date +%Y%m%d%H%M)
DEB_VERSION_SERVER=2.7.4-$(date +%Y%m%d%H%M) DEB_VERSION_SERVER=2.7.4-$(date +%Y%m%d%H%M)
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh
@ -38,6 +38,7 @@ prebuild(){
build() { build() {
cd /tmp/${APP}/ cd /tmp/${APP}/
rm packages/app-desktop/dist/Joplin-*.AppImage
BUILD_SEQUENCIAL=1 yarn install BUILD_SEQUENCIAL=1 yarn install
cd packages/app-desktop cd packages/app-desktop
npm run dist npm run dist
@ -64,6 +65,4 @@ makedeb(){
cp /tmp/joplin/packages/app-desktop/dist/Joplin-*.AppImage ${PATH_DEB}/usr/share/joplin/Joplin.AppImage cp /tmp/joplin/packages/app-desktop/dist/Joplin-*.AppImage ${PATH_DEB}/usr/share/joplin/Joplin.AppImage
sed -i "s/%VERSION%/$DEB_VERSION_DESKTOP/" ${PATH_DEB}/DEBIAN/control sed -i "s/%VERSION%/$DEB_VERSION_DESKTOP/" ${PATH_DEB}/DEBIAN/control
fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
} }

42
ressources/mautrix-whatsapp/debmaker
View file

@ -1,47 +1,35 @@
#!/bin/bash #!/bin/bash
VERSION=0.3.0 VERSION=0.3.1
RELEASE=1
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh
APP=mautrix-whatsapp APP=mautrix-whatsapp
DEPOT=https://github.com/mautrix/whatsapp.git DEPOT=https://github.com/mautrix/whatsapp.git
GIT_VERSION=v${VERSION} GIT_VERSION=v${VERSION}
DEB_VERSION=${VERSION}-${RELEASE}
DEBIAN_VERSION_CODENAME=bullseye DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=4 IMAGE_SIZE=4
STEP="envinit prebuild build makedeb" STEP="envinit prebuild makedeb"
envinit() { envinit() {
if [ $(dpkg -l | grep -e 'ii libolm3 ' | wc -l) -eq 1 ]; echo deb http://deb.debian.org/debian bullseye-backports main > /etc/apt/sources.list.d/backports.list
then apt-get update
apt-get update apt-get dist-upgrade -y
apt-get dist-upgrade -y apt install -y --no-install-recommends ca-certificates git libolm-dev debhelper-compat build-essential
else apt install -y --no-install-recommends -t bullseye-backports golang
apt install -y --no-install-recommends wget fakeroot dpkg ca-certificates git libolm3 libolm-dev build-essential
wget -qO - https://go.dev/dl/go1.17.7.linux-amd64.tar.gz | tar -C /usr/local -xz
fi
} }
prebuild(){ prebuild(){
[ -e /tmp/git ] && rm -fr /tmp/git rm /tmp/*.deb
[ -e /tmp/${APP} ] || mkdir /tmp/${APP} [ -e /tmp/${APP}] && rm -fr /tmp/${APP}
git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/git mkdir /tmp/${APP}
cp -r /tmp/git/. /tmp/${APP} git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP}
} cp -fr /tmp/src/debian /tmp/${APP}
build() {
cd /tmp/${APP}/
PATH=$PATH:/usr/local/go/bin ./build.sh
} }
makedeb(){ makedeb(){
PATH_DEB=/tmp/src/rootfs cd /tmp/${APP}/
dpkg-buildpackage -us -uc
cp /tmp/mautrix-whatsapp/mautrix-whatsapp ${PATH_DEB}/usr/lib/mautrix-whatsapp/mautrix-whatsapp cp /tmp/*.deb /tmp/dist
cp /tmp/mautrix-whatsapp/example-config.yaml ${PATH_DEB}/etc/mautrix-whatsapp/config.yaml
sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
} }

0
ressources/mautrix-whatsapp/rootfs/DEBIAN/changelog
View file

1
ressources/mautrix-whatsapp/rootfs/DEBIAN/conffiles
View file

@ -1 +0,0 @@
/etc/mautrix-whatsapp/config.yaml

8
ressources/mautrix-whatsapp/rootfs/DEBIAN/control
View file

@ -1,8 +0,0 @@
Package: mautrix-whatsapp
Version: %VERSION%
Section: base
Priority: optional
Architecture: all
Depends: libolm3
Maintainer: Thomas Legay <thomas@syngate.fr>
Description: mautrix-whatsapp bridge

4
ressources/mautrix-whatsapp/rootfs/DEBIAN/postinst
View file

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

1
ressources/mautrix-whatsapp/rootfs/etc/mautrix-whatsapp/.gitkeep
View file

@ -1 +0,0 @@

1
ressources/mautrix-whatsapp/rootfs/usr/lib/mautrix-whatsapp/.gitkeep
View file

@ -1 +0,0 @@

35
ressources/mautrix-whatsapp/rootfs/usr/lib/systemd/system/mautrix-whatsapp.service
View file

@ -1,35 +0,0 @@
[Unit]
Description=mautrix-whatsapp bridge
[Service]
Type=exec
User=mautrix-whatsapp
WorkingDirectory=/var/lib/mautrix-whatsapp
ExecStart=/usr/lib/mautrix-whatsapp/mautrix-whatsapp -c /etc/mautrix-whatsapp/config.yaml
Restart=on-failure
RestartSec=30s
# Optional hardening to improve security
ReadWritePaths=/var/lib/mautrix-whatsapp /etc/mautrix-whatsapp
NoNewPrivileges=yes
MemoryDenyWriteExecute=true
PrivateDevices=yes
PrivateTmp=yes
ProtectHome=yes
ProtectSystem=strict
ProtectControlGroups=true
RestrictSUIDSGID=true
RestrictRealtime=true
LockPersonality=true
ProtectKernelLogs=true
ProtectKernelTunables=true
ProtectHostname=true
ProtectKernelModules=true
PrivateUsers=true
ProtectClock=true
SystemCallArchitectures=native
SystemCallErrorNumber=EPERM
SystemCallFilter=@system-service
[Install]
WantedBy=multi-user.target

3
ressources/zigbee2mqtt/debmaker
View file

@ -1,14 +1,13 @@
#!/bin/bash #!/bin/bash
VERSION=1.25.0 VERSION=1.25.0
RELEASE=1
[ -e ./lib/function.sh ] && source ./lib/function.sh [ -e ./lib/function.sh ] && source ./lib/function.sh
APP=zigbee2mqtt APP=zigbee2mqtt
DEPOT=https://github.com/Koenkk/zigbee2mqtt.git DEPOT=https://github.com/Koenkk/zigbee2mqtt.git
GIT_VERSION=${VERSION} GIT_VERSION=${VERSION}
DEB_VERSION=${VERSION}-${RELEASE} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
DEBIAN_VERSION_CODENAME=bullseye DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=2 IMAGE_SIZE=2