diff --git a/additional_install.sh b/additional_install.sh index 76736fb..6c6a221 100755 --- a/additional_install.sh +++ b/additional_install.sh @@ -17,18 +17,18 @@ fi if [[ "$NEXTCLOUD" == "yes" ]]; then echo "Nextcloud install has started from ssh://$GIT_REPO/$ORGANIZATION/nextcloud.git"; - git clone ssh://$GIT_REPO/$ORGANIZATION/nextcloud.git /tmp/nextcloud - sed -i "s/DOMAIN_NAME/$NEXTCLOUD_DOMAIN/g" /tmp/nextcloud/nextcloud-secret.json - sed -i "s/USERNAME/$NEXTCLOUD_USERNAME/g" /tmp/nextcloud/nextcloud-secret.json - sed -i "s/USER_PASSWORD/$NEXTCLOUD_PASSWORD/g" /tmp/nextcloud/nextcloud-secret.json + git clone ssh://$GIT_REPO/$ORGANIZATION/nextcloud.git /tmp/nextcloud; + sed -i "s/DOMAIN_NAME/$NEXTCLOUD_DOMAIN/g" /tmp/nextcloud/nextcloud-secret.json; + sed -i "s/USERNAME/$NEXTCLOUD_USERNAME/g" /tmp/nextcloud/nextcloud-secret.json; + sed -i "s/USER_PASSWORD/$NEXTCLOUD_PASSWORD/g" /tmp/nextcloud/nextcloud-secret.json; cp -rv /tmp/nextcloud/nextcloud-secret.json /etc/user/secret/nextcloud-secret.json; sed -i "s/DOMAIN_NAME/$NEXTCLOUD_DOMAIN/g" /tmp/nextcloud/domain-nextcloud.json cp -rv /tmp/nextcloud/nextcloud.json $SERVICE_DIR/nextcloud-secret.json; - cp -rv /tmp/nextcloud/domain-nextcloud.json $SERVICE_DIR/nextcloud-secret.json; - cp -rv /tmp/nextcloud/firewall-nextcloud.json $SERVICE_DIR/nextcloud-secret.json; - cp -rv /tmp/nextcloud/firewall-nextcloud-server-dns.json $SERVICE_DIR/nextcloud-secret.json; - cp -rv /tmp/nextcloud/firewall-nextcloud-server-smtp.json $SERVICE_DIR/nextcloud-secret.json; + cp -rv /tmp/nextcloud/domain-nextcloud.json $SERVICE_DIR/domain-nextcloud.json; + cp -rv /tmp/nextcloud/firewall-nextcloud.json $SERVICE_DIR/firewall-nextcloud.json; + cp -rv /tmp/nextcloud/firewall-nextcloud-server-dns.json $SERVICE_DIR/firewall-nextcloud-server-dns.json; + cp -rv /tmp/nextcloud/firewall-nextcloud-server-smtp.json $SERVICE_DIR/firewall-nextcloud-server-smtp.json; fi; if [[ "$BITWARDEN" == "yes" ]]; then