mirror of
https://github.com/friendica/friendica
synced 2025-04-30 21:44:22 +02:00
Adding basepath, urlpath, hostname and ssl_policy to installation
This commit is contained in:
Philipp Holzer
parent
19f474f50d
commit
90a38a00d8
20 changed files with 380 additions and 127 deletions
|
|
@ -30,17 +30,19 @@ Options
|
|||
-v Show more debug information.
|
||||
-a All setup checks are required (except .htaccess)
|
||||
-f|--file <config> prepared config file (e.g. "config/local.config.php" itself) which will override every other config option - except the environment variables)
|
||||
-s|--savedb Save the DB credentials to the file (if environment variables is used)
|
||||
-H|--dbhost <host> The host of the mysql/mariadb database (env MYSQL_HOST)
|
||||
-p|--dbport <port> The port of the mysql/mariadb database (env MYSQL_PORT)
|
||||
-d|--dbdata <database> The name of the mysql/mariadb database (env MYSQL_DATABASE)
|
||||
-U|--dbuser <username> The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME)
|
||||
-P|--dbpass <password> The password of the mysql/mariadb database login (env MYSQL_PASSWORD)
|
||||
-u|--urlpath <url_path> The URL path of Friendica - f.e. '/friendica' (env FRIENDICA_URL_PATH)
|
||||
-b|--phppath <php_path> The path of the PHP binary (env FRIENDICA_PHP_PATH)
|
||||
-A|--admin <mail> The admin email address of Friendica (env FRIENDICA_ADMIN_MAIL)
|
||||
-T|--tz <timezone> The timezone of Friendica (env FRIENDICA_TZ)
|
||||
-L|--lang <language> The language of Friendica (env FRIENDICA_LANG)
|
||||
-s|--savedb Save the DB credentials to the file (if environment variables is used)
|
||||
-H|--dbhost <host> The host of the mysql/mariadb database (env MYSQL_HOST)
|
||||
-p|--dbport <port> The port of the mysql/mariadb database (env MYSQL_PORT)
|
||||
-d|--dbdata <database> The name of the mysql/mariadb database (env MYSQL_DATABASE)
|
||||
-U|--dbuser <username> The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME)
|
||||
-P|--dbpass <password> The password of the mysql/mariadb database login (env MYSQL_PASSWORD)
|
||||
-U|--urlpath <url_path> The URL path of Friendica - f.e. '/friendica' (env FRIENDICA_URL_PATH)
|
||||
-B|--phppath <php_path> The path of the PHP binary (env FRIENDICA_PHP_PATH)
|
||||
-b|--basepath <base_path> The basepath of Friendica(env FRIENDICA_BASE_PATH)
|
||||
-S|--sslpolicy <ssl_policy> The SSL policy of Friendica (env FRIENDICA_SSL_POLICY)
|
||||
-n|--hostname <hostname> The hostname of Friendica (env FRIENDICA_PHP_HOSTNAME)
|
||||
-t|--tz <timezone> The timezone of Friendica (env FRIENDICA_TZ)
|
||||
-L|--lang <language> The language of Friendica (env FRIENDICA_LANG)
|
||||
|
||||
Environment variables
|
||||
MYSQL_HOST The host of the mysql/mariadb database (mandatory if mysql and environment is used)
|
||||
|
|
@ -48,9 +50,12 @@ Environment variables
|
|||
MYSQL_USERNAME|MYSQL_USER The username of the mysql/mariadb database login (MYSQL_USERNAME is for mysql, MYSQL_USER for mariadb)
|
||||
MYSQL_PASSWORD The password of the mysql/mariadb database login
|
||||
MYSQL_DATABASE The name of the mysql/mariadb database
|
||||
FRIENDICA_URL_PATH The URL path of Friendica (f.e. '/friendica')
|
||||
FRIENDICA_PHP_PATH The path of the PHP binary
|
||||
FRIENDICA_URL_PATH The URL path of Friendica (f.e. '/friendica') - leave empty for auto detection
|
||||
FRIENDICA_PHP_PATH The path of the PHP binary - leave empty for auto detection
|
||||
FRIENDICA_BASE_PATH The basepath of Friendica - leave empty for auto detection
|
||||
FRIENDICA_ADMIN_MAIL The admin email address of Friendica (this email will be used for admin access)
|
||||
FRIENDICA_SSL_POLICY The SSL policy of Friendica (default is NO SSL)
|
||||
FRIENDICA_HOSTNAME The hostname of Friendica - leave empty for auto detection
|
||||
FRIENDICA_TZ The timezone of Friendica
|
||||
FRIENDICA_LANG The langauge of Friendica
|
||||
|
||||
|
|
@ -76,6 +81,7 @@ HELP;
|
|||
$installer = new Installer();
|
||||
|
||||
$configCache = $a->getConfigCache();
|
||||
$installer->setUpCache($configCache, dirname(__DIR__, 3), $_SERVER);
|
||||
|
||||
$this->out(" Complete!\n\n");
|
||||
|
||||
|
|
@ -99,7 +105,7 @@ HELP;
|
|||
// Copy config file
|
||||
$this->out("Copying config file...\n");
|
||||
if (!copy($a->getBasePath() . DIRECTORY_SEPARATOR . $config_file, $a->getBasePath() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php')) {
|
||||
throw new RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '" . $a->getBasePath() . "'" . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "local.config.php' manually.\n");
|
||||
throw new RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '" . $a->getBasePath() . "'" . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "local.config.php' manually.\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -129,7 +135,10 @@ HELP;
|
|||
$php_path = $this->getOption(['b', 'phppath'], !empty('FRIENDICA_PHP_PATH') ? getenv('FRIENDICA_PHP_PATH') : null);
|
||||
if (!empty($php_path)) {
|
||||
$configCache->set('config', 'php_path', $php_path);
|
||||
} else {
|
||||
$configCache->set('config', 'php_path', $installer->getPHPPath());
|
||||
}
|
||||
|
||||
$configCache->set('config', 'admin_email',
|
||||
$this->getOption(['A', 'admin'],
|
||||
!empty(getenv('FRIENDICA_ADMIN_MAIL')) ? getenv('FRIENDICA_ADMIN_MAIL') : ''));
|
||||
|
|
@ -140,16 +149,29 @@ HELP;
|
|||
$this->getOption(['L', 'lang'],
|
||||
!empty(getenv('FRIENDICA_LANG')) ? getenv('FRIENDICA_LANG') : Installer::DEFAULT_LANG));
|
||||
|
||||
$configCache->set('system', 'urlpath', $this->getOption(['u', 'urlpath'], !empty(getenv('FRIENDICA_URL_PATH')) ? getenv('FRIENDICA_URL_PATH') : ''));
|
||||
$basepath = $this->getOption(['b', 'basepath'], !empty(getenv('FRIENDICA_BASE_PATH')) ? getenv('FRIENDICA_BASE_PATH') : null);
|
||||
if (!empty($basepath)) {
|
||||
$configCache->set('system', 'basepath', $basepath);
|
||||
}
|
||||
$php_path = $this->getOption(['B', 'phppath'], !empty(getenv('FRIENDICA_PHP_PATH')) ? getenv('FRIENDICA_PHP_PATH') : null);
|
||||
if (!empty($php_path)) {
|
||||
$configCache->set('config', 'php_path', $php_path);
|
||||
}
|
||||
$ssl_policy = $this->getOption(['S', 'sslpolicy'], !empty(getenv('FRIENDICA_SSL_POLICY')) ? getenv('FRIENDICA_SSL_POLICY') : null);
|
||||
if (!empty($ssl_policy)) {
|
||||
$configCache->set('system', 'ssl_policy', $ssl_policy);
|
||||
}
|
||||
$configCache->set('config', 'hostname', $this->getOption(['n', 'hostname'], !empty(getenv('FRIENDICA_HOSTNAME')) ? getenv('FRIENDICA_HOSTNAME') : ''));
|
||||
|
||||
if (empty($php_path)) {
|
||||
$configCache->set('config', 'php_path', $installer->getPHPPath());
|
||||
$configCache->set('system', 'url', $installer->determineBaseUrl($configCache));
|
||||
|
||||
if (empty($configCache->get('config', 'hostname'))) {
|
||||
$this->out('The Friendica hostname has to be set during CLI installation.');
|
||||
return 1;
|
||||
}
|
||||
|
||||
$installer->createConfig(
|
||||
$a,
|
||||
$configCache,
|
||||
$a->getBasePath()
|
||||
);
|
||||
$installer->createConfig($configCache);
|
||||
}
|
||||
|
||||
$this->out(" Complete!\n\n");
|
||||
|
|
@ -159,7 +181,7 @@ HELP;
|
|||
|
||||
$installer->resetChecks();
|
||||
|
||||
if (!$installer->checkDB($a->getBasePath(), $configCache, $a->getProfiler())) {
|
||||
if (!$installer->checkDB($configCache, $a->getProfiler())) {
|
||||
$errorMessage = $this->extractErrors($installer->getChecks());
|
||||
throw new RuntimeException($errorMessage);
|
||||
}
|
||||
|
|
@ -220,10 +242,7 @@ HELP;
|
|||
$checked = false;
|
||||
}
|
||||
|
||||
$php_path = null;
|
||||
if ($configCache->has('config', 'php_path')) {
|
||||
$php_path = $configCache->get('config', 'php_path');
|
||||
}
|
||||
$php_path = $configCache->get('config', 'php_path');
|
||||
|
||||
if (!$installer->checkPHP($php_path, true)) {
|
||||
$checked = false;
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@ namespace Friendica\Core;
|
|||
|
||||
use DOMDocument;
|
||||
use Exception;
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Config\Cache\IConfigCache;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Database\DBStructure;
|
||||
use Friendica\Object\Image;
|
||||
use Friendica\Util\Logger\VoidLogger;
|
||||
use Friendica\Util\BasePath;
|
||||
use Friendica\Util\Network;
|
||||
use Friendica\Util\Profiler;
|
||||
use Friendica\Util\Strings;
|
||||
|
|
@ -131,15 +131,15 @@ class Installer
|
|||
* - Creates `config/local.config.php`
|
||||
* - Installs Database Structure
|
||||
*
|
||||
* @param App $app The Friendica App
|
||||
* @param IConfigCache $configCache The config cache with all config relevant information
|
||||
* @param string $basepath The basepath of Friendica
|
||||
*
|
||||
* @return bool true if the config was created, otherwise false
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
public function createConfig(App $app, IConfigCache $configCache, $basepath)
|
||||
public function createConfig(IConfigCache $configCache)
|
||||
{
|
||||
$basepath = $configCache->get('system', 'basepath');
|
||||
|
||||
$tpl = Renderer::getMarkupTemplate('local.config.tpl');
|
||||
$txt = Renderer::replaceMacros($tpl, [
|
||||
'$dbhost' => $configCache->get('database', 'hostname'),
|
||||
|
|
@ -147,12 +147,16 @@ class Installer
|
|||
'$dbpass' => $configCache->get('database', 'password'),
|
||||
'$dbdata' => $configCache->get('database', 'database'),
|
||||
|
||||
'$phpath' => $this->getPHPPath(),
|
||||
'$phpath' => $configCache->get('config', 'php_path'),
|
||||
'$adminmail' => $configCache->get('config', 'admin_email'),
|
||||
'$hostname' => $configCache->get('config', 'hostname'),
|
||||
|
||||
'$urlpath' => $configCache->get('system', 'urlpath'),
|
||||
'$baseurl' => $configCache->get('system', 'url'),
|
||||
'$sslpolicy' => $configCache->get('system', 'ssl_policy'),
|
||||
'$basepath' => $basepath,
|
||||
'$timezone' => $configCache->get('system', 'default_timezone'),
|
||||
'$language' => $configCache->get('system', 'language'),
|
||||
'$urlpath' => $app->getURLPath(),
|
||||
]);
|
||||
|
||||
$result = file_put_contents($basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php', $txt);
|
||||
|
|
@ -244,7 +248,7 @@ class Installer
|
|||
$help .= EOL . EOL;
|
||||
$tpl = Renderer::getMarkupTemplate('field_input.tpl');
|
||||
$help .= Renderer::replaceMacros($tpl, [
|
||||
'$field' => ['phpath', L10n::t('PHP executable path'), $phppath, L10n::t('Enter full path to php executable. You can leave this blank to continue the installation.')],
|
||||
'$field' => ['config.php_path', L10n::t('PHP executable path'), $phppath, L10n::t('Enter full path to php executable. You can leave this blank to continue the installation.')],
|
||||
]);
|
||||
$phppath = "";
|
||||
}
|
||||
|
|
@ -588,21 +592,20 @@ class Installer
|
|||
/**
|
||||
* Checking the Database connection and if it is available for the current installation
|
||||
*
|
||||
* @param string $basePath The basepath of this call
|
||||
* @param IConfigCache $configCache The configuration cache
|
||||
* @param Profiler $profiler The profiler of this app
|
||||
*
|
||||
* @return bool true if the check was successful, otherwise false
|
||||
* @throws Exception
|
||||
*/
|
||||
public function checkDB($basePath, IConfigCache $configCache, Profiler $profiler)
|
||||
public function checkDB(IConfigCache $configCache, Profiler $profiler)
|
||||
{
|
||||
$dbhost = $configCache->get('database', 'hostname');
|
||||
$dbuser = $configCache->get('database', 'username');
|
||||
$dbpass = $configCache->get('database', 'password');
|
||||
$dbdata = $configCache->get('database', 'database');
|
||||
|
||||
if (!DBA::connect($basePath, $configCache, $profiler, new VoidLogger(), $dbhost, $dbuser, $dbpass, $dbdata)) {
|
||||
if (!DBA::connect($configCache, $profiler, new VoidLogger(), $dbhost, $dbuser, $dbpass, $dbdata)) {
|
||||
$this->addCheck(L10n::t('Could not connect to database.'), false, true, '');
|
||||
|
||||
return false;
|
||||
|
|
@ -618,4 +621,18 @@ class Installer
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Setup the default cache for a new installation
|
||||
*
|
||||
* @param IConfigCache $configCache The configuration cache
|
||||
* @param string $basePath The determined basepath
|
||||
*
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
public function setUpCache(IConfigCache $configCache, $basePath)
|
||||
{
|
||||
$configCache->set('config', 'php_path' , $this->getPHPPath());
|
||||
$configCache->set('system', 'basepath' , $basePath);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue