Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/univention-app.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorszaimen <szaimen@e.mail.de>2022-11-02 13:23:07 +0300
committerszaimen <szaimen@e.mail.de>2022-11-02 13:23:07 +0300
commit68a33f9fe1b6d66b03f53540e442399fe13a488f (patch)
tree117a87c382276ac691128af9a711abb9fb57c70f
parente70a1ede50f7e0c518858e6a2fff2f0117c12c5f (diff)
move to entrypoint script
Signed-off-by: szaimen <szaimen@e.mail.de>
-rwxr-xr-xresources/entrypoint.sh7
-rw-r--r--setup6
2 files changed, 7 insertions, 6 deletions
diff --git a/resources/entrypoint.sh b/resources/entrypoint.sh
index 14844e4..d292e19 100755
--- a/resources/entrypoint.sh
+++ b/resources/entrypoint.sh
@@ -1,4 +1,11 @@
#!/usr/bin/env bash
+if [ -f "/var/www/html/occ" ]; then
+ # Apply one-click-instance settings...
+ sudo -u www-data php /var/www/html/occ config:system:set one-click-instance --value=true --type=bool
+ sudo -u www-data php /var/www/html/occ config:system:set one-click-instance.user-limit --value=100 --type=int
+ sudo -u www-data php /var/www/html/occ config:system:set one-click-instance.link --value="https://nextcloud.com/univention/"
+ sudo -u www-data php /var/www/html/occ app:enable support
+fi
service cron start && \
rm /var/run/apache2/apache2.pid 2>/dev/null || true && \
/usr/sbin/apache2ctl -D FOREGROUND
diff --git a/setup b/setup
index 8b78dab..95c9e7a 100644
--- a/setup
+++ b/setup
@@ -163,12 +163,6 @@ fi
# Recreate the htaccess on both install and update
$OCC maintenance:update:htaccess
-# Apply one-click-instance settings...
-$OCC config:system:set one-click-instance --value=true --type=bool
-$OCC config:system:set one-click-instance.user-limit --value=100 --type=int
-$OCC config:system:set one-click-instance.link --value="https://nextcloud.com/univention/"
-$OCC app:enable support
-
# env var is set from the dockerfile
if [ "$NC_IS_PATCHED" = true ]; then
$OCC config:system:set integrity.check.disabled --value="true" --type=boolean