From c72fb8b625466cb3fd270c8030287d78b665f569 Mon Sep 17 00:00:00 2001 From: Thomas Legay Date: Sat, 13 Apr 2024 23:16:05 +0200 Subject: [PATCH] update --- lib/exec_in_chroot.sh | 2 +- lib/function.sh | 2 +- postrun.sh | 5 ++- ressources/adguardhome/debmaker | 2 +- ressources/authelia/debmaker | 2 +- ressources/babybuddy/debmaker | 2 +- ressources/baikal/debian/baikal.install | 15 ++++----- ressources/baikal/debmaker | 4 +-- ressources/bitwarden-desktop/debmaker | 3 +- ressources/element-web/debmaker | 2 +- ressources/forgejo/debmaker | 2 +- ressources/joplin-desktop/debmaker | 8 ++--- ressources/keycloak/debmaker | 2 +- ressources/kimai2/debmaker | 2 +- ressources/mautrix-whatsapp/debmaker | 10 +++--- ressources/metabase/debmaker | 2 +- ressources/moodle-auth-oidc/debmaker | 32 +++++++++++++++++++ .../moodle-auth-oidc/rootfs/DEBIAN/changelog | 0 .../moodle-auth-oidc/rootfs/DEBIAN/control | 8 +++++ .../moodle-block-cohortspecifichtml/debmaker | 32 +++++++++++++++++++ .../rootfs/DEBIAN/changelog | 0 .../rootfs/DEBIAN/control | 8 +++++ ressources/moodle-editor-tiny-c4l/debmaker | 27 ++++++++++++++++ .../rootfs/DEBIAN/changelog | 0 .../rootfs/DEBIAN/control | 8 +++++ ressources/moodle-format-onetopic/debmaker | 27 ++++++++++++++++ .../rootfs/DEBIAN/changelog | 0 .../rootfs/DEBIAN/control | 8 +++++ ressources/moodle-format-tiles/debmaker | 32 +++++++++++++++++++ .../rootfs/DEBIAN/changelog | 0 .../moodle-format-tiles/rootfs/DEBIAN/control | 8 +++++ ressources/moodle-mod-board/debmaker | 27 ++++++++++++++++ .../moodle-mod-board/rootfs/DEBIAN/changelog | 0 .../moodle-mod-board/rootfs/DEBIAN/control | 8 +++++ ressources/moodle-theme-adaptable/debmaker | 32 +++++++++++++++++++ .../rootfs/DEBIAN/changelog | 0 .../rootfs/DEBIAN/control | 8 +++++ ressources/moodle/README.MD | 5 +++ ressources/moodle/debmaker | 12 +++++-- ressources/moodle/rootfs/DEBIAN/conffiles | 1 + .../systemd/system/moodle-adhoc_task@.service | 17 ++++++++++ .../lib/systemd/system/moodle-cron@.service | 18 +++++++++++ ressources/rss-bridge/debmaker | 2 +- ressources/vaultwarden-web/debmaker | 5 +-- ressources/wallabag/debmaker | 16 ++++------ ressources/zigbee2mqtt/debmaker | 2 +- 46 files changed, 361 insertions(+), 47 deletions(-) create mode 100755 ressources/moodle-auth-oidc/debmaker create mode 100644 ressources/moodle-auth-oidc/rootfs/DEBIAN/changelog create mode 100644 ressources/moodle-auth-oidc/rootfs/DEBIAN/control create mode 100755 ressources/moodle-block-cohortspecifichtml/debmaker create mode 100644 ressources/moodle-block-cohortspecifichtml/rootfs/DEBIAN/changelog create mode 100644 ressources/moodle-block-cohortspecifichtml/rootfs/DEBIAN/control create mode 100755 ressources/moodle-editor-tiny-c4l/debmaker create mode 100644 ressources/moodle-editor-tiny-c4l/rootfs/DEBIAN/changelog create mode 100644 ressources/moodle-editor-tiny-c4l/rootfs/DEBIAN/control create mode 100755 ressources/moodle-format-onetopic/debmaker create mode 100644 ressources/moodle-format-onetopic/rootfs/DEBIAN/changelog create mode 100644 ressources/moodle-format-onetopic/rootfs/DEBIAN/control create mode 100755 ressources/moodle-format-tiles/debmaker create mode 100644 ressources/moodle-format-tiles/rootfs/DEBIAN/changelog create mode 100644 ressources/moodle-format-tiles/rootfs/DEBIAN/control create mode 100755 ressources/moodle-mod-board/debmaker create mode 100644 ressources/moodle-mod-board/rootfs/DEBIAN/changelog create mode 100644 ressources/moodle-mod-board/rootfs/DEBIAN/control create mode 100755 ressources/moodle-theme-adaptable/debmaker create mode 100644 ressources/moodle-theme-adaptable/rootfs/DEBIAN/changelog create mode 100644 ressources/moodle-theme-adaptable/rootfs/DEBIAN/control create mode 100644 ressources/moodle/rootfs/DEBIAN/conffiles create mode 100644 ressources/moodle/rootfs/usr/lib/systemd/system/moodle-adhoc_task@.service create mode 100644 ressources/moodle/rootfs/usr/lib/systemd/system/moodle-cron@.service diff --git a/lib/exec_in_chroot.sh b/lib/exec_in_chroot.sh index b351a8f..999c5c6 100755 --- a/lib/exec_in_chroot.sh +++ b/lib/exec_in_chroot.sh @@ -38,7 +38,7 @@ configure_depot_nodejs() { } install_go() { - GO_VERSION=1.21.1 + GO_VERSION=1.22.1 [ ! "$1" == "" ] && GO_VERSION=$1 PATH=$PATH:/usr/local/go/bin if [ -e /usr/local/go/bin/go ] || [ ! "$(go version)" == "go version go${GO_VERSION} linux/amd64" ] ; diff --git a/lib/function.sh b/lib/function.sh index 51fb6ec..1874aa3 100644 --- a/lib/function.sh +++ b/lib/function.sh @@ -107,7 +107,7 @@ debmaker_run(){ sudo chroot ${MOUNT_PATH}/${APP}/ /tmp/src/exec_in_chroot.sh ${CURRENT_STEP} done fi - rm -fr dist/${APP}* + rm -fr dist/${APP}_* find ${MOUNT_PATH}/${APP}/tmp/dist/ -name *.deb -exec cp -v {} dist/ \; debmaker_umount_proc_sys ${MOUNT_PATH}/${APP}/ } diff --git a/postrun.sh b/postrun.sh index 08b45f1..36f33aa 100755 --- a/postrun.sh +++ b/postrun.sh @@ -1,3 +1,6 @@ -rsync -a --delete -e 'ssh -J lgy.fr' ./dist/ deb.net.lgy.fr:/tmp/new +rsync -a --delete --progress -e 'ssh -J lgy.fr' ./dist/ deb.net.lgy.fr:/tmp/new ssh -R /root/.gnupg/S.gpg-agent:/run/user/1000/gnupg/S.gpg-agent.extra -J lgy.fr deb.net.lgy.fr 'reprepro -Vb /var/www/html/ includedeb tools /tmp/new/*' +echo move to /tmp/ +mv ./dist/* /tmp/ #ssh -R /root/.gnupg/S.gpg-agent:/run/user/1000/gnupg/S.gpg-agent.extra -J lgy.fr deb.net.lgy.fr 'reprepro -Vb /var/www/html/ export tools /tmp/new/*' +#ssh -R /root/.gnupg/S.gpg-agent:/run/user/1000/gnupg/S.gpg-agent.extra -J lgy.fr deb.net.lgy.fr 'reprepro -Vb /var/www/html/ deleteunreferenced' diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker index ca7ba87..2e31317 100755 --- a/ressources/adguardhome/debmaker +++ b/ressources/adguardhome/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.108.0-b.49 +VERSION=0.108.0-b.54 APP=adguardhome DEPOT=https://github.com/AdguardTeam/AdGuardHome.git GIT_VERSION=v${VERSION} diff --git a/ressources/authelia/debmaker b/ressources/authelia/debmaker index a61d7b8..737da45 100755 --- a/ressources/authelia/debmaker +++ b/ressources/authelia/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=4.37.5 +VERSION=4.38.7 APP=authelia DEPOT=https://github.com/authelia/authelia.git GIT_VERSION=v${VERSION} diff --git a/ressources/babybuddy/debmaker b/ressources/babybuddy/debmaker index b50c601..9d56204 100755 --- a/ressources/babybuddy/debmaker +++ b/ressources/babybuddy/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.1.2 +VERSION=2.3.0 APP=babybuddy DEPOT=https://github.com/babybuddy/babybuddy.git GIT_VERSION=v${VERSION} diff --git a/ressources/baikal/debian/baikal.install b/ressources/baikal/debian/baikal.install index 33561e2..ae6ef36 100644 --- a/ressources/baikal/debian/baikal.install +++ b/ressources/baikal/debian/baikal.install @@ -1,9 +1,8 @@ -build/baikal/Core usr/share/baikal/Core -build/baikal/vendor usr/share/baikal/vendor -build/baikal/html usr/share/baikal/html -build/baikal/Core usr/share/baikal/html +build/baikal/Core usr/share/baikal/ +build/baikal/vendor usr/share/baikal/ +build/baikal/html usr/share/baikal/ build/baikal/Specific var/lib/baikal -build/baikal/README.md usr/share/doc/baikal/README.md -build/baikal/LICENSE usr/share/doc/baikal/LICENSE -config/baikal.yaml.dist etc/baikal/baikal.yaml -debian/baikal-apache.conf usr/share/doc/baikal/baikal-apache.conf +build/baikal/README.md usr/share/doc/baikal/ +build/baikal/LICENSE usr/share/doc/baikal/ +config/baikal.yaml.dist etc/baikal/ +debian/baikal-apache.conf usr/share/doc/baikal/ diff --git a/ressources/baikal/debmaker b/ressources/baikal/debmaker index b870a9d..8d25ae2 100755 --- a/ressources/baikal/debmaker +++ b/ressources/baikal/debmaker @@ -1,13 +1,13 @@ #!/bin/bash -VERSION=0.9.4 +VERSION=0.9.5 APP=baikal DEPOT=https://github.com/sabre-io/Baikal.git GIT_VERSION=${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=2 -PACKAGE_DEPENDENCY="php-mbstring php-exif php-opcache php-sockets php-tokenizer php-iconv php-json php-phar php-curl rsync zip make composer unzip debhelper-compat" +PACKAGE_DEPENDENCY="php-mbstring php-exif php-opcache php-sockets php-tokenizer php-iconv php-json php-phar php-curl rsync zip make composer unzip devscripts debhelper-compat build-essential" main(){ base_package_upgrade diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker index 17d91b3..3b697a5 100755 --- a/ressources/bitwarden-desktop/debmaker +++ b/ressources/bitwarden-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2024.3.0 +VERSION=2024.4.1 APP=bitwarden-desktop DEPOT=https://github.com/bitwarden/clients.git GIT_VERSION=desktop-v${VERSION} @@ -51,6 +51,7 @@ makedeb(){ cp $tmp ${PATH_DEB}/usr/share/icons/hicolor/${RESOLUTION}/apps/bitwarden.png done ln -s /usr/lib/bitwarden-desktop/bitwarden ${PATH_DEB}/usr/bin/bitwarden + chmod u+s ${PATH_DEB}/usr/bin/bitwarden/chrome-sandbox sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker index af332be..0fc5dfc 100755 --- a/ressources/element-web/debmaker +++ b/ressources/element-web/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.11.49 +VERSION=1.11.64 APP=element-web DEPOT=https://github.com/vector-im/element-web.git GIT_VERSION=v${VERSION} diff --git a/ressources/forgejo/debmaker b/ressources/forgejo/debmaker index f81c994..3708214 100755 --- a/ressources/forgejo/debmaker +++ b/ressources/forgejo/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.21.7-0 +VERSION=1.21.10-0 APP=forgejo DEPOT=https://codeberg.org/forgejo/forgejo GIT_VERSION=v${VERSION} diff --git a/ressources/joplin-desktop/debmaker b/ressources/joplin-desktop/debmaker index 68da241..8495c3f 100755 --- a/ressources/joplin-desktop/debmaker +++ b/ressources/joplin-desktop/debmaker @@ -1,18 +1,18 @@ #!/bin/bash -VERSION=2.14.14 +VERSION=3.0.2 APP=joplin-desktop GIT_VERSION=v${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEPOT=https://github.com/laurent22/joplin.git DEBIAN_VERSION_CODENAME=bookworm -IMAGE_SIZE=10 +IMAGE_SIZE=14 PACKAGE_DEPENDENCY="build-essential python-is-python3 nodejs rsync yarn" main(){ base_package_upgrade configure_depot_yarn - configure_depot_nodejs 18 + configure_depot_nodejs 20 install_package_dependency get_git_source build @@ -20,7 +20,7 @@ main(){ } build() { - rm -fr /tmp/${APP}/packages/app-mobile +# rm -fr /tmp/${APP}/packages/app-mobile cd /tmp/${APP}/ BUILD_SEQUENCIAL=1 yarn install cd packages/app-desktop diff --git a/ressources/keycloak/debmaker b/ressources/keycloak/debmaker index 2a1e40c..f108c95 100755 --- a/ressources/keycloak/debmaker +++ b/ressources/keycloak/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=24.0.1 +VERSION=24.0.2 APP=keycloak DEPOT=https://github.com/keycloak/keycloak.git GIT_VERSION=${VERSION} diff --git a/ressources/kimai2/debmaker b/ressources/kimai2/debmaker index 00627f2..c4c9719 100755 --- a/ressources/kimai2/debmaker +++ b/ressources/kimai2/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.4.1 +VERSION=2.14.0 APP=kimai2 DEPOT=https://github.com/kevinpapst/kimai2.git GIT_VERSION=${VERSION} diff --git a/ressources/mautrix-whatsapp/debmaker b/ressources/mautrix-whatsapp/debmaker index 59ed59e..5f2a93d 100755 --- a/ressources/mautrix-whatsapp/debmaker +++ b/ressources/mautrix-whatsapp/debmaker @@ -1,18 +1,19 @@ #!/bin/bash -VERSION=0.10.4 +VERSION=0.10.6 APP=mautrix-whatsapp DEPOT=https://github.com/mautrix/whatsapp.git GIT_VERSION=v${VERSION} DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=4 -PACKAGE_DEPENDENCY="debhelper-compat libolm-dev build-essential devscripts golang" +PACKAGE_DEPENDENCY="debhelper-compat libolm-dev build-essential devscripts go" main(){ -# echo deb http://deb.debian.org/debian bullseye-backports main > /etc/apt/sources.list.d/backports.list + echo deb http://deb.debian.org/debian bookworm-backports main > /etc/apt/sources.list.d/backports.list base_package_upgrade install_package_dependency -# apt install -y --no-install-recommends -t bullseye-backports golang +# install_go + apt install -y --no-install-recommends -t bookworm-backports golang get_git_source makedeb } @@ -20,6 +21,7 @@ main(){ makedeb(){ cd /tmp/${APP}/ rm /tmp/*.deb +# PATH=/usr/local/go/bin:$PATH cp -fr /tmp/src/debian /tmp/${APP} export DEBEMAIL=thomas@lgy.fr dch -v ${VERSION} diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker index a5aef6c..ef44aba 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.49.0 +VERSION=0.49.5 APP=metabase DEPOT=https://github.com/metabase/metabase.git GIT_VERSION=v$VERSION diff --git a/ressources/moodle-auth-oidc/debmaker b/ressources/moodle-auth-oidc/debmaker new file mode 100755 index 0000000..9d63d4d --- /dev/null +++ b/ressources/moodle-auth-oidc/debmaker @@ -0,0 +1,32 @@ +#!/bin/bash + +VERSION=4.3.1 +APP=moodle-auth-oidc +DEPOT=https://github.com/microsoft/moodle-auth_oidc.git +GIT_VERSION=v$VERSION +DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) +DEBIAN_VERSION_CODENAME=bookworm +IMAGE_SIZE=1 +PACKAGE_DEPENDENCY="" + +main(){ + base_package_upgrade + install_package_dependency + default_prebuild + build + makedeb +} + +build(){ + cd /tmp/${APP} +} + +makedeb(){ + PATH_DEB=/tmp/src/rootfs + + mkdir -p ${PATH_DEB}/usr/share/moodle/auth/ + mv /tmp/${APP} ${PATH_DEB}/usr/share/moodle/auth/oidc + + sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control + fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist +} diff --git a/ressources/moodle-auth-oidc/rootfs/DEBIAN/changelog b/ressources/moodle-auth-oidc/rootfs/DEBIAN/changelog new file mode 100644 index 0000000..e69de29 diff --git a/ressources/moodle-auth-oidc/rootfs/DEBIAN/control b/ressources/moodle-auth-oidc/rootfs/DEBIAN/control new file mode 100644 index 0000000..33ea2b2 --- /dev/null +++ b/ressources/moodle-auth-oidc/rootfs/DEBIAN/control @@ -0,0 +1,8 @@ +Package: moodle-auth-oidc +Version: %VERSION% +Section: contrib +Priority: optional +Architecture: all +Maintainer: Thomas Legay +Depends: moodle +Description: moodle-auth-oidc diff --git a/ressources/moodle-block-cohortspecifichtml/debmaker b/ressources/moodle-block-cohortspecifichtml/debmaker new file mode 100755 index 0000000..b6d5c68 --- /dev/null +++ b/ressources/moodle-block-cohortspecifichtml/debmaker @@ -0,0 +1,32 @@ +#!/bin/bash + +VERSION=4.3 +APP=moodle-block-cohortspecifichtml +DEPOT=https://github.com/moodle-an-hochschulen/moodle-block_cohortspecifichtml.git +GIT_VERSION=v$VERSION-r1 +DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) +DEBIAN_VERSION_CODENAME=bookworm +IMAGE_SIZE=1 +PACKAGE_DEPENDENCY="" + +main(){ + base_package_upgrade + install_package_dependency + default_prebuild + build + makedeb +} + +build(){ + cd /tmp/${APP} +} + +makedeb(){ + PATH_DEB=/tmp/src/rootfs + + mkdir -p ${PATH_DEB}/usr/share/moodle/blocks/ + mv /tmp/${APP} ${PATH_DEB}/usr/share/moodle/blocks/cohortspecifichtml + + sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control + fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist +} diff --git a/ressources/moodle-block-cohortspecifichtml/rootfs/DEBIAN/changelog b/ressources/moodle-block-cohortspecifichtml/rootfs/DEBIAN/changelog new file mode 100644 index 0000000..e69de29 diff --git a/ressources/moodle-block-cohortspecifichtml/rootfs/DEBIAN/control b/ressources/moodle-block-cohortspecifichtml/rootfs/DEBIAN/control new file mode 100644 index 0000000..3f0931b --- /dev/null +++ b/ressources/moodle-block-cohortspecifichtml/rootfs/DEBIAN/control @@ -0,0 +1,8 @@ +Package:moodle-block-cohortspecifichtml +Version: %VERSION% +Section: contrib +Priority: optional +Architecture: all +Maintainer: Thomas Legay +Depends: moodle +Description: moodle-block-cohortspecifichtml diff --git a/ressources/moodle-editor-tiny-c4l/debmaker b/ressources/moodle-editor-tiny-c4l/debmaker new file mode 100755 index 0000000..30c98f9 --- /dev/null +++ b/ressources/moodle-editor-tiny-c4l/debmaker @@ -0,0 +1,27 @@ +#!/bin/bash + +VERSION=2.1.1 +APP=moodle-editor-tiny-c4l +DEPOT=https://github.com/reskit/moodle-tiny_c4l.git +GIT_VERSION=v$VERSION +DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) +DEBIAN_VERSION_CODENAME=bookworm +IMAGE_SIZE=1 +PACKAGE_DEPENDENCY="" + +main(){ + base_package_upgrade + install_package_dependency + default_prebuild + makedeb +} + +makedeb(){ + PATH_DEB=/tmp/src/rootfs + + mkdir -p ${PATH_DEB}/usr/share/moodle/lib/editor/tiny/plugins/ + mv /tmp/${APP} ${PATH_DEB}/usr/share/moodle/lib/editor/tiny/plugins/c4l + + sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control + fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist +} diff --git a/ressources/moodle-editor-tiny-c4l/rootfs/DEBIAN/changelog b/ressources/moodle-editor-tiny-c4l/rootfs/DEBIAN/changelog new file mode 100644 index 0000000..e69de29 diff --git a/ressources/moodle-editor-tiny-c4l/rootfs/DEBIAN/control b/ressources/moodle-editor-tiny-c4l/rootfs/DEBIAN/control new file mode 100644 index 0000000..1309752 --- /dev/null +++ b/ressources/moodle-editor-tiny-c4l/rootfs/DEBIAN/control @@ -0,0 +1,8 @@ +Package: moodle-editor-tiny-c4l +Version: %VERSION% +Section: contrib +Priority: optional +Architecture: all +Maintainer: Thomas Legay +Depends: moodle +Description: moodle-editor-tiny-c4l diff --git a/ressources/moodle-format-onetopic/debmaker b/ressources/moodle-format-onetopic/debmaker new file mode 100755 index 0000000..995a3f9 --- /dev/null +++ b/ressources/moodle-format-onetopic/debmaker @@ -0,0 +1,27 @@ +#!/bin/bash + +VERSION=4.1.10 +APP=moodle-format-onetopic +DEPOT=https://github.com/davidherney/moodle-format_onetopic.git +GIT_VERSION=v$VERSION +DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) +DEBIAN_VERSION_CODENAME=bookworm +IMAGE_SIZE=1 +PACKAGE_DEPENDENCY="" + +main(){ + base_package_upgrade + install_package_dependency + default_prebuild + makedeb +} + +makedeb(){ + PATH_DEB=/tmp/src/rootfs + + mkdir -p ${PATH_DEB}/usr/share/moodle//course/format/ + mv /tmp/${APP} ${PATH_DEB}/usr/share/moodle//course/format/onetopic + + sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control + fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist +} diff --git a/ressources/moodle-format-onetopic/rootfs/DEBIAN/changelog b/ressources/moodle-format-onetopic/rootfs/DEBIAN/changelog new file mode 100644 index 0000000..e69de29 diff --git a/ressources/moodle-format-onetopic/rootfs/DEBIAN/control b/ressources/moodle-format-onetopic/rootfs/DEBIAN/control new file mode 100644 index 0000000..e46027c --- /dev/null +++ b/ressources/moodle-format-onetopic/rootfs/DEBIAN/control @@ -0,0 +1,8 @@ +Package: moodle-format-onetopic +Version: %VERSION% +Section: contrib +Priority: optional +Architecture: all +Maintainer: Thomas Legay +Depends: moodle +Description: moodle-format-onetopic diff --git a/ressources/moodle-format-tiles/debmaker b/ressources/moodle-format-tiles/debmaker new file mode 100755 index 0000000..0bee0f6 --- /dev/null +++ b/ressources/moodle-format-tiles/debmaker @@ -0,0 +1,32 @@ +#!/bin/bash + +VERSION=4.3 +APP=moodle-format-tiles +DEPOT=https://bitbucket.org/dw8/moodle-format_tiles.git +GIT_VERSION=last +DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) +DEBIAN_VERSION_CODENAME=bookworm +IMAGE_SIZE=1 +PACKAGE_DEPENDENCY="" + +main(){ + base_package_upgrade + install_package_dependency + default_prebuild + build + makedeb +} + +build(){ + cd /tmp/${APP} +} + +makedeb(){ + PATH_DEB=/tmp/src/rootfs + + mkdir -p ${PATH_DEB}/usr/share/moodle//course/format/ + mv /tmp/${APP} ${PATH_DEB}/usr/share/moodle//course/format/tiles + + sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control + fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist +} diff --git a/ressources/moodle-format-tiles/rootfs/DEBIAN/changelog b/ressources/moodle-format-tiles/rootfs/DEBIAN/changelog new file mode 100644 index 0000000..e69de29 diff --git a/ressources/moodle-format-tiles/rootfs/DEBIAN/control b/ressources/moodle-format-tiles/rootfs/DEBIAN/control new file mode 100644 index 0000000..289cc15 --- /dev/null +++ b/ressources/moodle-format-tiles/rootfs/DEBIAN/control @@ -0,0 +1,8 @@ +Package: moodle-format-tiles +Version: %VERSION% +Section: contrib +Priority: optional +Architecture: all +Maintainer: Thomas Legay +Depends: moodle +Description: moodle-format-tiles diff --git a/ressources/moodle-mod-board/debmaker b/ressources/moodle-mod-board/debmaker new file mode 100755 index 0000000..d377c59 --- /dev/null +++ b/ressources/moodle-mod-board/debmaker @@ -0,0 +1,27 @@ +#!/bin/bash + +VERSION=1.401.03 +APP=moodle-mod-board +DEPOT=https://github.com/brickfield/moodle-mod_board.git +GIT_VERSION=v$VERSION +DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) +DEBIAN_VERSION_CODENAME=bookworm +IMAGE_SIZE=1 +PACKAGE_DEPENDENCY="" + +main(){ + base_package_upgrade + install_package_dependency + default_prebuild + makedeb +} + +makedeb(){ + PATH_DEB=/tmp/src/rootfs + + mkdir -p ${PATH_DEB}/usr/share/moodle//mod/ + mv /tmp/${APP} ${PATH_DEB}/usr/share/moodle/mod/board + + sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control + fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist +} diff --git a/ressources/moodle-mod-board/rootfs/DEBIAN/changelog b/ressources/moodle-mod-board/rootfs/DEBIAN/changelog new file mode 100644 index 0000000..e69de29 diff --git a/ressources/moodle-mod-board/rootfs/DEBIAN/control b/ressources/moodle-mod-board/rootfs/DEBIAN/control new file mode 100644 index 0000000..53e6972 --- /dev/null +++ b/ressources/moodle-mod-board/rootfs/DEBIAN/control @@ -0,0 +1,8 @@ +Package: moodle-mod-board +Version: %VERSION% +Section: contrib +Priority: optional +Architecture: all +Maintainer: Thomas Legay +Depends: moodle +Description: moodle-mod-board diff --git a/ressources/moodle-theme-adaptable/debmaker b/ressources/moodle-theme-adaptable/debmaker new file mode 100755 index 0000000..1489d87 --- /dev/null +++ b/ressources/moodle-theme-adaptable/debmaker @@ -0,0 +1,32 @@ +#!/bin/bash + +VERSION=403.1.4 +APP=moodle-theme-adaptable +DEPOT=https://github.com/gjbarnard/moodle-theme_adaptable.git +GIT_VERSION=V$VERSION +DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) +DEBIAN_VERSION_CODENAME=bookworm +IMAGE_SIZE=1 +PACKAGE_DEPENDENCY="" + +main(){ + base_package_upgrade + install_package_dependency + default_prebuild + build + makedeb +} + +build(){ + cd /tmp/${APP} +} + +makedeb(){ + PATH_DEB=/tmp/src/rootfs + + mkdir -p ${PATH_DEB}/usr/share/moodle/theme/ + mv /tmp/${APP} ${PATH_DEB}/usr/share/moodle/theme/adaptable + + sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control + fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist +} diff --git a/ressources/moodle-theme-adaptable/rootfs/DEBIAN/changelog b/ressources/moodle-theme-adaptable/rootfs/DEBIAN/changelog new file mode 100644 index 0000000..e69de29 diff --git a/ressources/moodle-theme-adaptable/rootfs/DEBIAN/control b/ressources/moodle-theme-adaptable/rootfs/DEBIAN/control new file mode 100644 index 0000000..f74832d --- /dev/null +++ b/ressources/moodle-theme-adaptable/rootfs/DEBIAN/control @@ -0,0 +1,8 @@ +Package:moodle-theme-adaptable +Version: %VERSION% +Section: contrib +Priority: optional +Architecture: all +Maintainer: Thomas Legay +Depends: moodle +Description: moodle-theme-adaptable diff --git a/ressources/moodle/README.MD b/ressources/moodle/README.MD index 4965849..1517b43 100644 --- a/ressources/moodle/README.MD +++ b/ressources/moodle/README.MD @@ -14,4 +14,9 @@ apt-get update apt-get install -y moodle +systemctl enable --now moodle-cron@1 +systemctl enable --now moodle-cron@2 +systemctl enable --now moodle-adhoc_task@.service@1 +systemctl enable --now moodle-adhoc_task@.service@2 + ``` diff --git a/ressources/moodle/debmaker b/ressources/moodle/debmaker index 65dbdcd..d1d85d6 100755 --- a/ressources/moodle/debmaker +++ b/ressources/moodle/debmaker @@ -3,7 +3,7 @@ VERSION=4.3.0 APP=moodle DEPOT=git://git.moodle.org/moodle.git -GIT_VERSION=v$VERSION +GIT_VERSION=MOODLE_403_STABLE DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=2 @@ -24,8 +24,14 @@ build(){ makedeb(){ PATH_DEB=/tmp/src/rootfs - mv /tmp/${APP} ${PATH_DEB_INSTALL}/usr/share/ - + mkdir -p ${PATH_DEB}/usr/share/ + mv /tmp/${APP} ${PATH_DEB}/usr/share/ + + mkdir -p ${PATH_DEB}/etc/moodle/ + mv ${PATH_DEB}/usr/share/moodle/config-dist.php ${PATH_DEB}/etc/moodle/config.php + sed -i "s/__DIR__/'\/usr\/share\/moodle'/" ${PATH_DEB}/etc/moodle/config.php + ln -s /etc/moodle/config.php ${PATH_DEB}/usr/share/moodle/config.php + sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist } diff --git a/ressources/moodle/rootfs/DEBIAN/conffiles b/ressources/moodle/rootfs/DEBIAN/conffiles new file mode 100644 index 0000000..585bb0a --- /dev/null +++ b/ressources/moodle/rootfs/DEBIAN/conffiles @@ -0,0 +1 @@ +/etc/moodle/config.php diff --git a/ressources/moodle/rootfs/usr/lib/systemd/system/moodle-adhoc_task@.service b/ressources/moodle/rootfs/usr/lib/systemd/system/moodle-adhoc_task@.service new file mode 100644 index 0000000..15177f6 --- /dev/null +++ b/ressources/moodle/rootfs/usr/lib/systemd/system/moodle-adhoc_task@.service @@ -0,0 +1,17 @@ +[Unit] +Description=moodle adhoc task +StartLimitIntervalSec=120 +StartLimitBurst=10 + +[Service] +user=www-data +group=www-data + +Restart=on-failure +RestartSec=60s +StandardOutput=null +Restart=always +ExecStart=/usr/bin/php /usr/share/moodle/admin/cli/adhoc_task.php -e -k=3600 + +[Install] +WantedBy=multi-user.target diff --git a/ressources/moodle/rootfs/usr/lib/systemd/system/moodle-cron@.service b/ressources/moodle/rootfs/usr/lib/systemd/system/moodle-cron@.service new file mode 100644 index 0000000..9c846b5 --- /dev/null +++ b/ressources/moodle/rootfs/usr/lib/systemd/system/moodle-cron@.service @@ -0,0 +1,18 @@ +[Unit] +Description=moodle cron task +StartLimitIntervalSec=120 +StartLimitBurst=10 + +[Service] +User=www-data +Group=www-data + +Restart=on-failure +RestartSec=60s + +StandardOutput=null +Restart=always +ExecStart=/usr/bin/php /usr/share/moodle/admin/cli/cron.php + +[Install] +WantedBy=multi-user.target diff --git a/ressources/rss-bridge/debmaker b/ressources/rss-bridge/debmaker index c13044c..a8556df 100755 --- a/ressources/rss-bridge/debmaker +++ b/ressources/rss-bridge/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2023-09-24 +VERSION=2024-02-02 APP=rss-bridge DEPOT=https://github.com/RSS-Bridge/rss-bridge.git GIT_VERSION=$VERSION diff --git a/ressources/vaultwarden-web/debmaker b/ressources/vaultwarden-web/debmaker index a8342f9..d6e456d 100755 --- a/ressources/vaultwarden-web/debmaker +++ b/ressources/vaultwarden-web/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2023.10.0 +VERSION=2024.3.1 APP=vaultwarden-web GIT_VERSION=v$VERSION DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) @@ -19,8 +19,9 @@ main(){ } build() { + export NODE_OPTIONS=--max-old-space-size=8192 cd /tmp/${APP} - echo web-$GIT_VERSION | ./package_web_vault.sh + echo $GIT_VERSION | ./package_web_vault.sh } makedeb(){ diff --git a/ressources/wallabag/debmaker b/ressources/wallabag/debmaker index e453982..a2e0375 100755 --- a/ressources/wallabag/debmaker +++ b/ressources/wallabag/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.6.2 +VERSION=2.6.9 APP=wallabag GIT_VERSION=$VERSION DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) @@ -12,22 +12,18 @@ PACKAGE_DEPENDENCY="php-common php-xml php-json php-gd php-mbstring php-xml php- main(){ base_package_upgrade - envinit + configure_depot_yarn + configure_depot_nodejs 20 + install_package_dependency + install_composer get_git_source build makedeb } -envinit() { - configure_depot_yarn - configure_depot_nodejs 18 - install_package_dependency - install_composer -} - build() { cd /tmp/${APP} - COMPOSER_ALLOW_SUPERUSER=1 SYMFONY_ENV=prod php /usr/bin/composer.phar install --no-dev -o --prefer-dist -n --no-scripts + COMPOSER_ALLOW_SUPERUSER=1 SYMFONY_ENV=prod php /usr/bin/composer install --no-dev -o --prefer-dist -n --no-scripts ENV=PROD make build } diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker index 92046bc..af3bdc6 100755 --- a/ressources/zigbee2mqtt/debmaker +++ b/ressources/zigbee2mqtt/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.36.0 +VERSION=1.36.1 APP=zigbee2mqtt DEPOT=https://github.com/Koenkk/zigbee2mqtt.git GIT_VERSION=${VERSION}