Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-31 22:42:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4967 from nupplaphil/4899-autoinstall-with-file

Browse source 
AutomaticInstallation - use config file
This commit is contained in:
Hypolite Petovan 2018-05-01 08:19:02 -04:00 committed by GitHub
commit 538143f628
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
htconfig.php
View file

@ -23,10 +23,10 @@ $db_data = 'mysqldatabasename';
// Use environment variables for mysql if they are set beforehand
if (!empty(getenv('MYSQL_HOST'))
&& !empty(getenv('MYSQL_PORT'))
&& !empty(getenv('MYSQL_USERNAME'))
&& !empty(getenv('MYSQL_PASSWORD'))
&& !empty(getenv('MYSQL_DATABASE'))) {
&& !empty(getenv('MYSQL_PORT'))
&& !empty(getenv('MYSQL_USERNAME'))
&& !empty(getenv('MYSQL_PASSWORD'))
&& !empty(getenv('MYSQL_DATABASE'))) {
$db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
$db_user = getenv('MYSQL_USERNAME');
$db_pass = getenv('MYSQL_PASSWORD');

11
src/Core/Console/AutomaticInstallation.php
View file

@ -29,6 +29,7 @@ Options
-h|--help|-? Show help information
-v Show more debug information.
-a All setup checks are required (except .htaccess)
-f prepared config file (e.g. ".htconfig.php" itself)
HELP;
}
@ -42,7 +43,11 @@ HELP;
$db_user = '';
$db_pass = '';
$db_data = '';
require_once 'htconfig.php';
$config_file = $this->getOption('f', 'htconfig.php');
$this->out("Using config $config_file...\n");
require_once $config_file;
Install::setInstallMode();
@ -87,8 +92,8 @@ HELP;
// Copy config file
$this->out("Saving config file...\n");
if (!copy('htconfig.php', '.htconfig.php')) {
throw new \RuntimeException("ERROR: Saving config file failed. Please copy .htautoinstall.php to .htconfig.php manually.\n");
if ($config_file != '.htconfig.php' && !copy($config_file, '.htconfig.php')) {
throw new \RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '.htconfig.php' manually.\n");
}
$this->out(" Complete!\n\n");
$this->out("\nInstallation is finished\n");