wtserver 0.48

conf/rsyslog/20-nextcloud.conf

+:syslogtag, startswith, "Nextcloud"        -/var/log/nextcloud.log
+
+# Stop logging
+& stop
\ No newline at end of file

distros/debian12/askquestions.sh

@@ -3,7 +3,6 @@
 #	Ask for all needed user input
 #---------------------------------------------------------------------
 AskQuestions() {
-    START_TIME=$SECONDS
     CFG_SETUP_WEB=true  #Needed for Multiserver setup compatibility
     CFG_SETUP_MAIL=true #Needed for Multiserver setup compatibility
     CFG_SETUP_NS=true   #Needed for Multiserver setup compatibility
@@ -380,6 +379,4 @@ AskQuestions() {
 
     echo -n -e "$IDENTATION_LVL_2 ${BBlack}Unit${NC}: ${green}" $SSL_ORGUNIT "${NC} "
     echo
-
-    MeasureTimeDuration $START_TIME
 }

distros/debian12/install_owncloud.sh

@@ -286,7 +286,7 @@ EOF
 	    TIMEZONE=$(cat /etc/timezone)
 	    sudo -u www-data php8.2 "$CLOUD_DIR"/occ config:system:set logtimezone --value=$TIMEZONE >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
 	    sudo -u www-data php8.2 "$CLOUD_DIR"/occ config:system:set logdateformat --value 'Y-m-d H:i:s' >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
-	    sudo -u www-data php8.2 "$CLOUD_DIR"/occ config:system:set overwrite.cli.url --value "https://$CFG_HOSTNAME_DOMAIN/cloud"
+	    sudo -u www-data php8.2 "$CLOUD_DIR"/occ config:system:set overwrite.cli.url --value "https://$CFG_HOSTNAME_DOMAIN/cloud" >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
 	    sudo -u www-data php8.2 "$CLOUD_DIR"/occ config:system:set log_type --value 'syslog' >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
 	    sudo -u www-data php8.2 "$CLOUD_DIR"/occ config:system:set syslog_tag --value 'Nextcloud' >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
 	    sudo -u www-data php8.2 "$CLOUD_DIR"/occ config:system:set system_addressbook_exposed --value 'no' >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
@@ -316,8 +316,8 @@ EOF
 	    # and calendar apps are the extensions we really care about here.
 	    #hide_output sudo -u www-data php8.2 $CLOUD_DIR/console.php app:disable firstrunwizard
 	    sudo -u www-data php8.2 "$CLOUD_DIR/console.php" app:enable user_external
-	    sudo -u www-data php8.2 "$CLOUD_DIR/console.php" app:enable contacts
-	    sudo -u www-data php8.2 "$CLOUD_DIR/console.php" app:enable calendar
+	    sudo -u www-data php8.2 "$CLOUD_DIR/console.php" app:enable contacts >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
+	    sudo -u www-data php8.2 "$CLOUD_DIR/console.php" app:enable calendar >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
 
 	    # When upgrading, run the upgrade script again now that apps are enabled. It seems like
 	    # the first upgrade at the top won't work because apps may be disabled during upgrade?
@@ -327,19 +327,19 @@ EOF
 	    if [ $E -ne 0 ] && [ $E -ne 3 ]; then exit 1; fi
 
 	    # Disable default apps that are not needed
-            sudo -u www-data php8.2 $CLOUD_DIR/occ app:disable photos dashboard activity weather_status logreader | (grep -v "No such app enabled" || /bin/true)
+            sudo -u www-data php8.2 $CLOUD_DIR/occ app:disable photos dashboard activity weather_status logreader | (grep -v "No such app enabled" || /bin/true) >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
 
 	    # Install additional apps
 	    (sudo -u www-data php8.2 $CLOUD_DIR/occ app:install notes) || true
-	    sudo -u www-data php8.2 $CLOUD_DIR/console.php app:enable notes
+	    #sudo -u www-data php8.2 $CLOUD_DIR/console.php app:enable notes
 
-	    (sudo -u www-data php8.2 $CLOUD_DIR/occ app:install twofactor_totp) || true
-	    sudo -u www-data php8.2 $CLOUD_DIR/console.php app:enable twofactor_totp
+	    #(sudo -u www-data php8.2 $CLOUD_DIR/occ app:install twofactor_totp) || true
+	    #sudo -u www-data php8.2 $CLOUD_DIR/console.php app:enable twofactor_totp
 
 	    # Upgrade all apps
 	    sudo -u www-data php8.2 $CLOUD_DIR/occ app:update --all
 
-	    echo -n -e "Nextcloud version:"
+	    echo -e "$IDENTATION_LVL_1 Nextcloud version:"
 	    sudo -u www-data php8.2 "$CLOUD_DIR"/occ status
 	    sleep 3
 	    echo -e "[${green}DONE${NC}]"
@@ -431,16 +431,17 @@ EOF
 
     # We also need to change the sending mode from background-job to occ
     # Or else the reminders will just be sent as soon as possible when the background jobs run
-    sudo -u www-data php8.2 -f $CLOUD_DIR/occ config:app:set dav sendEventRemindersMode --value occ
+    sudo -u www-data php8.2 -f $CLOUD_DIR/occ config:app:set dav sendEventRemindersMode --value occ >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
 
     # Run the maintenance command
     sudo -u www-data php8.2 $CLOUD_DIR/occ maintenance:repair --include-expensive
 
     # Set the config to read-only
-    sed -i'' "s/'config_is_read_only'\s*=>\s*false/'config_is_read_only' => true/" "$STORAGE_ROOT/owncloud/config.php"
+    #sed -i'' "s/'config_is_read_only'\s*=>\s*false/'config_is_read_only' => true/" "$STORAGE_ROOT/owncloud/config.php"
+    sed -i'' "s/'config_is_read_only'\s*=>\s*false/'config_is_read_only' => true/" "$CLOUD_DIR/config/config.php"
 
     # Create nextcloud log in /var/log
-    hide_output install -m 644 conf/rsyslog/20-nextcloud.conf /etc/rsyslog.d/
+    hide_output install -m 644 $APWD/conf/rsyslog/20-nextcloud.conf /etc/rsyslog.d/
 
     # There's nothing much of interest that a user could do as an admin for Nextcloud,
     # and there's a lot they could mess up, so we don't make any users admins of Nextcloud.