Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Leantime and rebuild with php8.1 (required for latest Leantime). #3

Merged
merged 1 commit into from Dec 11, 2022
Merged

Update Leantime and rebuild with php8.1 (required for latest Leantime). #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
@@ -1,2 +1,6 @@
PHP_MEMORY_LIMIT=512M
PHP_EXTRA_PINS=libpcre2-8-0 libgd3
PHP_VERSION=8.1

include $(FAB_PATH)/common/mk/turnkey/lamp.mk
include $(FAB_PATH)/common/mk/turnkey.mk
8 changes: 8 additions & 0 deletions changelog
View file
Open in desktop
@@ -1,3 +1,11 @@
turnkey-leantime-17.2 (1) turnkey; urgency=low

* Upgrade Leantime: v2.2.11 - closes #1784.

* Include PHP 8.1 (from sury.org) - PHP 8.0+ required for Leantime v2.2.0+.

-- Jeremy Davis <jeremy@turnkeylinux.org> Wed, 07 Dec 2022 04:37:16 +0000

turnkey-leantime-17.1 (1) turnkey; urgency=low

* Updated all Debian packages to latest.
Expand Down
2 changes: 1 addition & 1 deletion conf.d/downloads
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ dl() {
cd $2; curl -L -f -O $PROXY $1; cd -
}

VERSION="v2.1.8"
VERSION="v2.2.11"
URL="https://github.com/Leantime/leantime/releases/download/$VERSION/Leantime-$VERSION.tar.gz"

dl $URL /usr/local/src
9 changes: 4 additions & 5 deletions conf.d/main
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ CONF=$WEBROOT/config/configuration.php

tar oxf $SRC/Leantime-v*.tar.gz -C $(dirname $WEBROOT)
rm -f $SRC/Leantime-v*.tar.gz
mv $(dirname $WEBROOT)/leantime* $WEBROOT
[[ -d "$WEBROOT" ]] || mv $(dirname $WEBROOT)/leantime* $WEBROOT
cp $(dirname $CONF)/configuration.sample.php $CONF
chown -R www-data:www-data $WEBROOT

Expand All @@ -23,12 +23,11 @@ mysqladmin create $DB_NAME
mysql --batch --execute "grant all privileges on $DB_NAME.* to $DB_USER@localhost identified by '$DB_PASS'; flush privileges;"

sed -i "\|\$sitename =|s|=.*|= \"TurnKey Leantime\";|" $CONF
sed -i "\|\$dbUser=|s|=.*|=\"$DB_USER\";|" $CONF
sed -i "\|\$dbPassword=|s|=.*|=\"$DB_PASS\";|" $CONF
sed -i "\|\$dbDatabase=|s|=.*|=\"$DB_NAME\";|" $CONF
sed -i "\|\$dbUser =|s|=.*|=\"$DB_USER\";|" $CONF
sed -i "\|\$dbPassword =|s|=.*|=\"$DB_PASS\";|" $CONF
sed -i "\|\$dbDatabase =|s|=.*|=\"$DB_NAME\";|" $CONF
sed -i "\|\$sessionpassword =|s|=.*|=\"$(mcookie)$(mcookie)\";|" $CONF


a2dissite 000-default
a2enmod headers
a2ensite leantime
Expand Down
2 changes: 1 addition & 1 deletion overlay/usr/lib/inithooks/firstboot.d/20regen-leantime-secrets
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ CONF=$WEBROOT/config/configuration.php
DB_USER=leantime
DB_PASS=$(mcookie)

sed -i "\|\$dbPassword=|s|=.*|=\"$DB_PASS\";|" $CONF
sed -i "\|\$dbPassword =|s|=.*|=\"$DB_PASS\";|" $CONF
$INITHOOKS_PATH/bin/mysqlconf.py --user="$DB_USER" --pass="$DB_PASS"

sed -i "\|\$sessionpassword =|s|=.*|=\"$(mcookie)$(mcookie)\";|" $CONF
4 changes: 2 additions & 2 deletions plan/main
View file
Open in desktop
@@ -1,5 +1,5 @@
#include <turnkey/base>
#include <turnkey/lamp>
#include <turnkey/lamp81>

python3-bcrypt
php-mbstring
php8.1-mbstring