Photowall/Photowall_Docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'levi' into 'master'

Browse Source 
Merge levi into master

See merge request photowall/photowall-docker!5
This commit is contained in:
Levi 2021-01-25 21:15:05 +01:00
commit 38fa28ad03
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
database_init.php
View File

@ -4,7 +4,6 @@ include_once "globals.php";
// csatlakozás az adatbázis szervezhez,
// a konkrét adatbázist még nem adjuk meg, mert lehet még nem létezik
$dbconn = mysqli_connect(SQL_IP, SQL_USER, SQL_PASS);
$use_database_query = 'USE ' . SQL_DB . ';';
if (PHW_DB_GRANTED) {
$create_database_query = 'CREATE DATABASE IF NOT EXISTS ' . SQL_DB . ';';
@ -13,13 +12,11 @@ if (PHW_DB_GRANTED) {
} else {
echo "Hiba az adatbázis létrehozása során: " . mysqli_error($dbconn) . PHP_EOL;
}
} else {
mysqli_query($dbconn, $use_database_query);
}
// az adatbázis kiválasztása
$use_database_query = 'USE ' . SQL_DB . ';';
mysqli_query($dbconn, $use_database_query)
mysqli_query($dbconn, $use_database_query);
$create_tables_queries = "

2
entrypoint.sh
View File

@ -23,7 +23,7 @@ cat /database_init.php | php -d display_errors=on -d error_reporting=-1
sed -i "s|_ServerName_|ServerName ${PHW_SERVER_NAME}|g" /etc/apache2/sites-available/000-default.conf
# remove index.html
rm /var/www/html/index.html
rm -f /var/www/html/index.html
# start webserver
/usr/sbin/apache2ctl -D FOREGROUND