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

ServerName behelyettesítés javítva, adatbáziskiválasztás javítva, entrypoint quoting javítva

Browse Source
This commit is contained in:
Wiesner András 2021-01-24 21:08:47 +01:00
parent 9ea6211427
commit 7e626b3fb2
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/apache2/sites-available/000-default.conf
View File

@ -1,12 +1,5 @@
<VirtualHost *:80> <VirtualHost *:80>
# The ServerName directive sets the request scheme, hostname and port that _ServerName_
# the server uses to identify itself. This is used when creating
# redirection URLs. In the context of virtual hosts, the ServerName
# specifies what hostname must appear in the request's Host: header to
# match this virtual host. For the default virtual host (this file) this
# value is not decisive as it is used as a last resort host regardless.
# However, you must set it for any further virtual host explicitly.
ServerName
ServerAdmin webmaster@localhost ServerAdmin webmaster@localhost
DocumentRoot /var/www/html DocumentRoot /var/www/html

5
database_init.php
View File

@ -4,15 +4,17 @@ include_once "globals.php";
// csatlakozás az adatbázis szervezhez, // csatlakozás az adatbázis szervezhez,
// a konkrét adatbázist még nem adjuk meg, mert lehet még nem létezik // 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); $dbconn = mysqli_connect(SQL_IP, SQL_USER, SQL_PASS);
$use_database_query = 'USE ' . SQL_DB . ';';
if (PHW_DB_GRANTED) { if (PHW_DB_GRANTED) {
$create_database_query = 'CREATE DATABASE IF NOT EXISTS ' . SQL_DB . ';'; $create_database_query = 'CREATE DATABASE IF NOT EXISTS ' . SQL_DB . ';';
$use_database_query = 'USE ' . SQL_DB . ';';
if (mysqli_query($dbconn, $create_database_query) && mysqli_query($dbconn, $use_database_query)) { if (mysqli_query($dbconn, $create_database_query) && mysqli_query($dbconn, $use_database_query)) {
echo "Adatbázis létrehozva." . PHP_EOL; echo "Adatbázis létrehozva." . PHP_EOL;
} else { } else {
echo "Hiba az adatbázis létrehozása során: " . mysqli_error($dbconn) . PHP_EOL; echo "Hiba az adatbázis létrehozása során: " . mysqli_error($dbconn) . PHP_EOL;
} }
} else {
mysqli_query($dbconn, $use_database_query);
} }
$create_tables_queries = " $create_tables_queries = "
@ -20,6 +22,7 @@ $create_tables_queries = "
CREATE TABLE IF NOT EXISTS `publish_table` ( CREATE TABLE IF NOT EXISTS `publish_table` (
`No` int NOT NULL AUTO_INCREMENT, `No` int NOT NULL AUTO_INCREMENT,
`Author` varchar(45) NOT NULL, `Author` varchar(45) NOT NULL,
`AuthorGroup` varchar(45) NOT NULL,
`Title` varchar(45) NOT NULL, `Title` varchar(45) NOT NULL,
`Description` text, `Description` text,
`Image_FileName` varchar(45) NOT NULL, `Image_FileName` varchar(45) NOT NULL,

4
entrypoint.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# generate revisor's password hash # generate revisor's password hash
PHW_REVIS_PWD_HASH=$(php -r "echo password_hash("${PHW_REVIS_PWD}", PASSWORD_DEFAULT);") PHW_REVIS_PWD_HASH=$(php -r "echo password_hash('${PHW_REVIS_PWD}', PASSWORD_DEFAULT);")
# generate globals.php from environment variables # generate globals.php from environment variables
cd /var/www/html cd /var/www/html
@ -20,7 +20,7 @@ chown -R www-data:www-data ARTWORKS
cat /database_init.php | php -d display_errors=on -d error_reporting=-1 cat /database_init.php | php -d display_errors=on -d error_reporting=-1
# substitute server name # substitute server name
sed -i "s|ServerName|ServerName ${PHW_SERVER_NAME}|g" /etc/apache2/sites-available/000-default.conf sed -i "s|_ServerName_|ServerName ${PHW_SERVER_NAME}|g" /etc/apache2/sites-available/000-default.conf
# remove index.html # remove index.html
rm /var/www/html/index.html rm /var/www/html/index.html