diff --git a/rootfs/etc/cont-init.d/00-nextcloud b/rootfs/etc/cont-init.d/00-nextcloud index 3cebf37..ef55013 100644 --- a/rootfs/etc/cont-init.d/00-nextcloud +++ b/rootfs/etc/cont-init.d/00-nextcloud @@ -7,20 +7,20 @@ if [ ! -f /var/lib/nextcloud/data/.ocdata ]; then touch /var/lib/nextcloud/data/.ocdata fi -PGPASSWORD=$DBPASSWORD psql -h $DBHOST -U $DBUSER -d $DBNAME -c "SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = '${DBTABLEPREFIX}appconfig')" | grep f +PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -c "SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = '${DB_TABLE_PREFIX}appconfig')" | grep f if [ $? -ne 1 ]; then cd /var/lib/nextcloud s6-setuidgid nginx ./occ maintenance:install \ --database=pgsql \ - --database-host=$DBHOST \ - --database-name=$DBNAME \ - --database-user=$DBUSER \ - --database-pass=$DBPASSWORD \ - --database-table-prefix=$DBTABLEPREFIX \ - --admin-user=$ADMINUSER \ - --admin-pass=$ADMINPASSWORD \ + --database-host=$DB_HOST \ + --database-name=$DB_NAME \ + --database-user=$DB_USER \ + --database-pass=$DB_PASSWORD \ + --database-table-prefix=$DB_TABLE_PREFIX \ + --admin-user=$ADMIN_USER \ + --admin-pass=$ADMIN_PASSWORD \ --no-interaction s6-setuidgid nginx ./occ config:app:set --value cron core backgroundjobs_mode @@ -29,20 +29,20 @@ if [ $? -ne 1 ]; then s6-setuidgid nginx ./occ ldap:create-empty-config s6-setuidgid nginx ./occ ldap:set-config '' hasMemberOfFilterSupport "1" - s6-setuidgid nginx ./occ ldap:set-config '' ldapHost "$LDAPHOST" - s6-setuidgid nginx ./occ ldap:set-config '' ldapPort "$LDAPPORT" - s6-setuidgid nginx ./occ ldap:set-config '' ldapTLS "$LDAPTLS" - s6-setuidgid nginx ./occ ldap:set-config '' ldapAgentName "$LDAPBINDUSER" - s6-setuidgid nginx ./occ ldap:set-config '' ldapAgentPassword "$LDAPBINDPASSWORD" - s6-setuidgid nginx ./occ ldap:set-config '' ldapLoginFilter "$LDAPLOGINFILTER" - s6-setuidgid nginx ./occ ldap:set-config '' ldapUserDisplayName "$LDAPUSERDISPLAYNAME" - s6-setuidgid nginx ./occ ldap:set-config '' ldapUserFilter "$LDAPUSERFILTER" - s6-setuidgid nginx ./occ ldap:set-config '' ldapBase "$LDAPBASEDN" - s6-setuidgid nginx ./occ ldap:set-config '' ldapBaseUsers "$LDAPBASEUSERDN" - s6-setuidgid nginx ./occ ldap:set-config '' ldapEmailAttribute "$LDAPEMAILATTRIBUTE" - s6-setuidgid nginx ./occ ldap:set-config '' ldapBaseGroups "$LDAPBASEGROUPDN" - s6-setuidgid nginx ./occ ldap:set-config '' ldapGroupFilter "$LDAPGROUPFILTER" - s6-setuidgid nginx ./occ ldap:set-config '' ldapExpertUsernameAttr "$LDAPUSERNAMEATTRIBUTE" - s6-setuidgid nginx ./occ ldap:set-config '' turnOffCertCheck "$LDAPTURNOFFCERTCHECK" + s6-setuidgid nginx ./occ ldap:set-config '' ldapHost "$LDAP_HOST" + s6-setuidgid nginx ./occ ldap:set-config '' ldapPort "$LDAP_PORT" + s6-setuidgid nginx ./occ ldap:set-config '' ldapTLS "$LDAP_TLS" + s6-setuidgid nginx ./occ ldap:set-config '' ldapAgentName "$LDAP_BIND_USER" + s6-setuidgid nginx ./occ ldap:set-config '' ldapAgentPassword "$LDAP_BIND_PASSWORD" + s6-setuidgid nginx ./occ ldap:set-config '' ldapLoginFilter "$LDAP_LOGIN_FILTER" + s6-setuidgid nginx ./occ ldap:set-config '' ldapUserDisplayName "$LDAP_USER_DISPLAY_NAME" + s6-setuidgid nginx ./occ ldap:set-config '' ldapUserFilter "$LDAP_USER_FILTER" + s6-setuidgid nginx ./occ ldap:set-config '' ldapBase "$LDAP_BASE_DN" + s6-setuidgid nginx ./occ ldap:set-config '' ldapBaseUsers "$LDAP_BASE_USER_DN" + s6-setuidgid nginx ./occ ldap:set-config '' ldapEmailAttribute "$LDAP_EMAIL_ATTRIBUTE" + s6-setuidgid nginx ./occ ldap:set-config '' ldapBaseGroups "$LDAP_BASE_GROUP_DN" + s6-setuidgid nginx ./occ ldap:set-config '' ldapGroupFilter "$LDAP_GROUP_FILTER" + s6-setuidgid nginx ./occ ldap:set-config '' ldapExpertUsernameAttr "$LDAP_USERNAME_ATTRIBUTE" + s6-setuidgid nginx ./occ ldap:set-config '' turnOffCertCheck "$LDAP_TURN_OFF_CERT_CHECK" s6-setuidgid nginx ./occ ldap:set-config '' ldapConfigurationActive "1" fi