Merge branch 'main' of https://github.com/jakani24/ma

src/server/cyberhex-code/install/end.php

@@ -27,13 +27,13 @@
 <?php
 if(isset($_GET["end"])){
 	$success=1;
-	if(!unlink("create_admin.php")){
+/*	if(!unlink("create_admin.php")){
 		$success=0;
 	}if(!unlink("welcome.php")){
 		$success=0;
 	}if(!unlink("create_db.php")){
 		$success=0;
-	}
+	}*/
 	if($success!==1){
 	echo('<p style="font-size: 20px; color: red;">There was an error finishing the installation. Please try again or contact support at: <a href="mailto:info.jakach@gmail.com">info.jakach@gmail.com</a></p>');
 	}else{

src/server/docker-compose.yml

@@ -9,8 +9,6 @@ services:
     networks:
       cyberhex-network:
         ipv4_address: 192.168.178.2
-#    ports:
-#      - "3306:3306"
     volumes:
       - cyberhex-db-storage:/var/lib/mysql
 
@@ -31,7 +29,6 @@ services:
       - ./cyberhex-code:/var/www/html
       - ./apache-conf:/etc/apache2/sites-available
       - ./certs:/etc/apache2/certs
-
 networks:
   cyberhex-network:
     driver: bridge

src/server/srv_dockerfile

@@ -5,3 +5,5 @@ FROM php:apache
 RUN docker-php-ext-install mysqli
 RUN a2enmod ssl
 RUN service apache2 restart
+RUN mkdir /var/www/html/install/
+RUN chown -R www-data:www-data /var/www/html/install/