diff --git a/CMS/nextcloud/Apache-unconfigured b/CMS/nextcloud/Apache-unconfigured
new file mode 100644
index 0000000..a5c2b30
--- /dev/null
+++ b/CMS/nextcloud/Apache-unconfigured
@@ -0,0 +1,29 @@
+#beginConf
+
+ErrorLog ${APACHE_LOG_DIR}/SITEname_error.log
+#CustomLog ${APACHE_LOG_DIR}/SITEname_custom.log combined
+
+DirectoryIndex index.php index.html index.htm
+DocumentRoot /var/www/DOMAINname/html
+
+
+
+ Require all granted
+ AllowOverride All
+ Options FollowSymLinks MultiViews
+ Satisfy Any
+
+ Dav off
+
+
+
+
+
+ Require all denied
+
+
+
+ SetHandler "proxy:unix:/var/run/php/phpPHPver-fpm-SITEname.sock|fcgi://localhost"
+
+
+#endConf
\ No newline at end of file
diff --git a/CMS/nextcloud/apache-conf.sh b/CMS/nextcloud/apache-conf.sh
new file mode 100644
index 0000000..5a15506
--- /dev/null
+++ b/CMS/nextcloud/apache-conf.sh
@@ -0,0 +1,11 @@
+#Apache
+wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/Apache-unconfigured -O /tmp/apache-siteconf
+sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' /tmp/apache-siteconf
+sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/apache-siteconf' -e '/#ConfHere/c\' /etc/apache2/sites-available/"$sitename"_"$site_ext".conf
+chown "$sitename":"$sitename" -R /var/www/"$domain"/html
+
+#PHP
+sed -i -e '/cgi.fix_pathinfo/c\php_admin_value[cgi.fix_pathinfo] = 1' /etc/php/"$phpver"/fpm/pool.d/$sitename.conf
+sed -i -e '/security.limit_extensions/c\php_admin_value[security.limit_extensions] = .php' /etc/php/"$phpver"/fpm/pool.d/$sitename.conf
+
+systemctl reload apache2 php$phpver-fpm
\ No newline at end of file
diff --git a/CMS/nextcloud/conf.sh b/CMS/nextcloud/conf.sh
index 9a6cabd..89e34cf 100644
--- a/CMS/nextcloud/conf.sh
+++ b/CMS/nextcloud/conf.sh
@@ -3,6 +3,47 @@ wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/Fpm-Pool.conf-unconfigure
sed -i -e 's/PHPver/'$phpver'/' -e 's/SITEname/'$sitename'/' -e 's/DOMAINname/'$domain'/' /etc/php/"$phpver"/fpm/pool.d/$sitename.conf
groupadd "$sitename"
useradd -g "$sitename" "$sitename"
+mkdir -p /var/www/"$domain"/html/data
+
+#Getting Nextcloud
+wget -t7 http://mirror.nxdi.nl/resources/nextcloud/latest.tar.bz2 -O /tmp/nextcloud.tar.bz2
+tar jxf /tmp/nextcloud.tar.bz2 -C /tmp
+cp -a /tmp/nextcloud/. /var/www/"$domain"/html
+touch /var/www/"$domain"/html/data/nextcloud.log
+
+#Creating DB
+db_suffix=`expr $(ls -l /var/www | grep -c ^d) - 1`
+db_name="nextcloud_$db_suffix"
+db_user="nextcloud_$db_suffix"
+db_pass=$(date +%s|sha256sum|base64|head -c 32)
+mysql -u root -p"$password" -e "CREATE DATABASE "$db_name" DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;" > $OUTPUT 2>&1
+mysql -u root -p"$password" -e "CREATE USER '"$db_user"'@'localhost' IDENTIFIED BY '"$db_pass"';" > $OUTPUT 2>&1
+mysql -u root -p"$password" -e "GRANT ALL ON "$db_name".* TO '"$db_user"'@'localhost';" > $OUTPUT 2>&1
+mysql -u root -p"$password" -e "FLUSH PRIVILEGES;" > $OUTPUT 2>&1
+
+#Configuring Nextcloud
+cat < /var/www/$domain/html/config/autoconfig.php
+ "mysql",
+ "dbname" => "${db_name}",
+ "dbuser" => "${db_user}",
+ "dbpass" => "${db_pass}",
+ "dbhost" => "localhost",
+ "dbtableprefix" => "",
+ "simpleSignUpLink.shown" => false,
+ "directory" => "/var/www/$domain/html/data",
+);
+EOF
+
+chown "$sitename":"$sitename" -R /var/www/"$domain"/html
+
+#Makeing nextcloud Finalize script and setting login Notice
+wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/nextcloud-init.sh -O ~/nextcloud-init.sh
+sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' ~/nextcloud-init.sh
+wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/MotdNextCloud -O /etc/update-motd.d/51-nextnotice
+chmod +x /etc/update-motd.d/51-nextnotice
+
#Nextcloud logging location
mkdir /var/log/nextcloud
diff --git a/CMS/nextcloud/nginx-conf.sh b/CMS/nextcloud/nginx-conf.sh
index 92c2a70..c6e88d2 100644
--- a/CMS/nextcloud/nginx-conf.sh
+++ b/CMS/nextcloud/nginx-conf.sh
@@ -7,46 +7,9 @@ sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/ng
if [ $sslenable = 0 ]; then
sed -i -e '/fastcgi_param HTTPS/c\# fastcgi_param HTTPS' /etc/nginx/sites-available/"$sitename"_nossl
fi
-mkdir -p /var/www/"$domain"/html/data
+
systemctl reload nginx
-#Getting Nextcloud
-wget -t7 http://mirror.nxdi.nl/resources/nextcloud/latest.tar.bz2 -O /tmp/nextcloud.tar.bz2
-tar jxf /tmp/nextcloud.tar.bz2 -C /tmp
-cp -a /tmp/nextcloud/. /var/www/"$domain"/html
-touch /var/www/"$domain"/html/data/nextcloud.log
-#Creating DB
-db_suffix=`expr $(ls -l /var/www | grep -c ^d) - 1`
-db_name="nextcloud_$db_suffix"
-db_user="nextcloud_$db_suffix"
-db_pass=$(date +%s|sha256sum|base64|head -c 32)
-mysql -u root -p"$password" -e "CREATE DATABASE "$db_name" DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;" > $OUTPUT 2>&1
-mysql -u root -p"$password" -e "CREATE USER '"$db_user"'@'localhost' IDENTIFIED BY '"$db_pass"';" > $OUTPUT 2>&1
-mysql -u root -p"$password" -e "GRANT ALL ON "$db_name".* TO '"$db_user"'@'localhost';" > $OUTPUT 2>&1
-mysql -u root -p"$password" -e "FLUSH PRIVILEGES;" > $OUTPUT 2>&1
-
-#Configuring Nextcloud
-cat < /var/www/$domain/html/config/autoconfig.php
- "mysql",
- "dbname" => "${db_name}",
- "dbuser" => "${db_user}",
- "dbpass" => "${db_pass}",
- "dbhost" => "localhost",
- "dbtableprefix" => "",
- "simpleSignUpLink.shown" => false,
- "directory" => "/var/www/$domain/html/data",
-);
-EOF
-
-chown "$sitename":"$sitename" -R /var/www/"$domain"/html
-
-#Makeing nextcloud Finalize script and setting login Notice
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/nextcloud-init.sh -O ~/nextcloud-init.sh
-sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' ~/nextcloud-init.sh
-wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/MotdNextCloud -O /etc/update-motd.d/51-nextnotice
-chmod +x /etc/update-motd.d/51-nextnotice