GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'cli-install' into 'master'

Browse Source 
Don't write the config file when --skip-config flag is given to the installer.

See merge request gnu/gnu-social!155
This commit is contained in:
mmn 2017-12-17 17:25:21 +00:00
commit a1ea335140
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/installer.php
View File

@ -85,7 +85,7 @@ abstract class Installer
$pass = true;
$config = INSTALLDIR.'/config.php';
if (file_exists($config)) {
if (!$this->skipConfig && file_exists($config)) {
if (!is_writable($config) || filesize($config) > 0) {
if (filesize($config) == 0) {
$this->warning('Config file "config.php" already exists and is empty, but is not writable.');
@ -126,14 +126,16 @@ abstract class Installer
}
// @fixme this check seems to be insufficient with Windows ACLs
if (!is_writable(INSTALLDIR)) {
if (!$this->skipConfig && !is_writable(INSTALLDIR)) {
$this->warning(sprintf('Cannot write config file to: <code>%s</code></p>', INSTALLDIR),
sprintf('On your server, try this command: <code>chmod a+w %s</code>', INSTALLDIR));
$pass = false;
}
// Check the subdirs used for file uploads
$fileSubdirs = array('avatar', 'file');
// TODO get another flag for this --skipFileSubdirCreation
if (!$this->skipConfig) {
$fileSubdirs = array($this->avatarDir, $this->fileDir);
foreach ($fileSubdirs as $fileSubdir) {
$fileFullPath = INSTALLDIR."/$fileSubdir";
if (!file_exists($fileFullPath)) {
@ -148,7 +150,7 @@ abstract class Installer
$pass = false;
}
}
}
return $pass;
}
@ -515,6 +517,9 @@ abstract class Installer
*/
function registerInitialUser()
{
// initalize hostname from install arguments, so it can be used to find
// the /etc config file from the commandline installer
$server = $this->server;
require_once INSTALLDIR . '/lib/common.php';
$data = array('nickname' => $this->adminNick,
@ -580,10 +585,10 @@ abstract class Installer
return false;
}
if (!$this->skipConfig) {
// Make sure we can write to the file twice
$oldUmask = umask(000);
if (!$this->skipConfig) {
$this->updateStatus("Writing config file...");
$res = $this->writeConf();
@ -616,12 +621,12 @@ abstract class Installer
$this->updateStatus("Can't write to config file.", true);
return false;
}
}
// Restore original umask
umask($oldUmask);
// Set permissions back to something decent
chmod(INSTALLDIR.'/config.php', 0644);
}
$scheme = $this->ssl === 'always' ? 'https' : 'http';
$link = "{$scheme}://{$this->server}/{$this->path}";

2
scripts/install_cli.php
View File

@ -47,10 +47,10 @@ class CliInstaller extends Installer
*/
function main()
{
if ($this->prepare()) {
if (!$this->checkPrereqs()) {
return false;
}
if ($this->prepare()) {
return $this->handle();
} else {
$this->showHelp();