From 7442d271c062f2e8a3f0f54d6c274211a2c57f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kov=C3=A1ts=20Levente?= Date: Mon, 25 Jan 2021 07:36:26 +0100 Subject: [PATCH 1/2] =?UTF-8?q?adatb=C3=A1zis=20kiv=C3=A1laszt=C3=A1s=20cs?= =?UTF-8?q?ak=20egyszer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database_init.php | 3 --- entrypoint.sh | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/database_init.php b/database_init.php index bca3e83..61905f3 100644 --- a/database_init.php +++ b/database_init.php @@ -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,8 +12,6 @@ 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 diff --git a/entrypoint.sh b/entrypoint.sh index db10816..64e1e3d 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -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 From 99e5fae387e689c1543005a93cb245874e505fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kov=C3=A1ts=20Levente?= Date: Mon, 25 Jan 2021 09:13:18 +0100 Subject: [PATCH 2/2] =?UTF-8?q?el=C3=ADr=C3=A1s=20jav=C3=ADt=C3=A1sa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit lemaradt pontosvessző --- database_init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database_init.php b/database_init.php index 61905f3..69dff01 100644 --- a/database_init.php +++ b/database_init.php @@ -16,7 +16,7 @@ if (PHW_DB_GRANTED) { // 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 = "