v1

nextcloud-startup-script.sh

@@ -51,7 +51,7 @@ elif print_text_in_color "$ICyan" "Testing internet connection..." && ping githu
 then
 true
 # shellcheck source=lib.sh
-NCDB=1 && FIRST_IFACE=1 && CHECK_CURRENT_REPO=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
+NCDB=1 && FIRST_IFACE=1 && CHECK_CURRENT_REPO=1 . <(curl -sL https://git.schroedercity.com/voltron/Nextcloud-Install/raw/branch/master/lib.sh)
 unset FIRST_IFACE
 unset CHECK_CURRENT_REPO
 unset NCDB
@@ -117,7 +117,7 @@ Please also post this issue on: https://github.com/nextcloud/vm/issues"
 fi
 
 # shellcheck source=lib.sh
-NCDB=1 && CHECK_CURRENT_REPO=1 && NC_UPDATE=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
+NCDB=1 && CHECK_CURRENT_REPO=1 && NC_UPDATE=1 . <(curl -sL https://git.schroedercity.com/voltron/Nextcloud-Install/raw/branch/master/lib.sh)
 unset NC_UPDATE
 unset CHECK_CURRENT_REPO
 unset NCDB
@@ -246,17 +246,6 @@ else
     chmod 750 $HTML/index.php && chown www-data:www-data $HTML/index.php
 fi
 
-# Change 000-default to $WEB_ROOT
-sed -i "s|DocumentRoot /var/www/html|DocumentRoot $HTML|g" /etc/apache2/sites-available/000-default.conf
-
-# Make possible to see the welcome screen (without this php-fpm won't reach it)
- sed -i '14i\    # http://lost.l-w.ca/0x05/apache-mod_proxy_fcgi-and-php-fpm/' /etc/apache2/sites-available/000-default.conf
- sed -i '15i\   <FilesMatch "\.php$">' /etc/apache2/sites-available/000-default.conf
- sed -i '16i\    <If "-f %{SCRIPT_FILENAME}">' /etc/apache2/sites-available/000-default.conf
- sed -i '17i\      SetHandler "proxy:unix:/run/php/php'$PHPVER'-fpm.nextcloud.sock|fcgi://localhost"' /etc/apache2/sites-available/000-default.conf
- sed -i '18i\   </If>' /etc/apache2/sites-available/000-default.conf
- sed -i '19i\   </FilesMatch>' /etc/apache2/sites-available/000-default.conf
- sed -i '20i\    ' /etc/apache2/sites-available/000-default.conf
 
 # Make $SCRIPTS excutable
 chmod +x -R $SCRIPTS
@@ -406,16 +395,7 @@ do
 done 9< results
 rm -f results
 
-# Let's Encrypt
-if [[ "yes" == $(ask_yes_or_no "Do you want to install SSL?") ]]
-then
-    bash $SCRIPTS/activate-ssl.sh
-else
-    echo
-    print_text_in_color "$ICyan" "OK, but if you want to run it later, just type: sudo bash $SCRIPTS/activate-ssl.sh"
-    any_key "Press any key to continue..."
-fi
-clear
+
 
 # Install Apps
 whiptail --title "Which apps do you want to install?" --checklist --separate-output "Automatically configure and install selected apps\nSelect by pressing the spacebar" "$WT_HEIGHT" "$WT_WIDTH" 4 \
@@ -530,25 +510,7 @@ NCADMIN=$(occ_command user:list | awk '{print $3}')
 occ_command notification:generate -l "Please remember to setup SMTP to be able to send shared links, user notifications and more via email. Please go here and start setting it up: https://your-nextcloud/settings/admin." "$NCADMIN" "Please setup SMTP"
 occ_command notification:generate -l "If you need support, please visit the shop: https://shop.hanssonit.se" "$NCADMIN" "Do you need support?"
 
-# Fixes https://github.com/nextcloud/vm/issues/58
-a2dismod status
-restart_webserver
 
-if home_sme_server
-then
-    # Add specific values to PHP-FPM based on 16 GB RAM
-    check_command sed -i "s|pm.max_children.*|pm.max_children = 307|g" "$PHP_POOL_DIR"/nextcloud.conf
-    check_command sed -i "s|pm.start_servers.*|pm.start_servers = 30|g" "$PHP_POOL_DIR"/nextcloud.conf
-    check_command sed -i "s|pm.min_spare_servers.*|pm.min_spare_servers = 20|g" "$PHP_POOL_DIR"/nextcloud.conf
-    check_command sed -i "s|pm.max_spare_servers.*|pm.max_spare_servers = 257|g" "$PHP_POOL_DIR"/nextcloud.conf
-    restart_webserver
-else
-    # Calculate the values of PHP-FPM based on the amount of RAM available (minimum 2 GB or 8 children)
-    calculate_php_fpm
-
-    # Run again if values are reset on last run
-    calculate_php_fpm
-fi
 
 # Add temporary fix if needed
 bash "$SCRIPTS"/temporary-fix.sh