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

github.com/nextcloud/nextcloudpi.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authornachoparker <nacho@ownyourbits.com>2018-03-18 14:07:00 +0300
committernachoparker <nacho@ownyourbits.com>2018-03-18 23:18:46 +0300
commit1e12154fc693384904037710334e441ed012b5e8 (patch)
treeb1885368a30e27230b4d538f7347029f17359606 /etc
parent423ea0ed00507074673ca568544fd59df144f263 (diff)
build: fix SD card generation and provisioning
Diffstat (limited to 'etc')
-rw-r--r--etc/nextcloudpi-config.d/nc-nextcloud.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/nextcloudpi-config.d/nc-nextcloud.sh b/etc/nextcloudpi-config.d/nc-nextcloud.sh
index 45f2e1c0..0eeea963 100644
--- a/etc/nextcloudpi-config.d/nc-nextcloud.sh
+++ b/etc/nextcloudpi-config.d/nc-nextcloud.sh
@@ -40,6 +40,9 @@ You can use nc-backup "
install()
{
+ # During build, this step is run before nextcloudpi.sh. Avoid executing twice
+ [[ -f /usr/lib/systemd/system/nc-provisioning.service ]] && return 0
+
# Optional packets for Nextcloud and Apps
apt-get update
$APTINSTALL lbzip2 iputils-ping
@@ -91,7 +94,7 @@ install()
[Unit]
Description=Randomize passwords on first boot
Requires=network.target
-After=mysql.service
+After=mysql.service redis.service
[Service]
ExecStart=/bin/bash /usr/local/bin/ncp-provisioning.sh
@@ -99,8 +102,6 @@ ExecStart=/bin/bash /usr/local/bin/ncp-provisioning.sh
[Install]
WantedBy=multi-user.target
EOF
-
- [[ "$DOCKERBUILD" != 1 ]] && systemctl enable nc-provisioning
return 0
}