seed = util.dictmap(make_filename_regex, {
'WIZARD_IP': 'IP', # obsolete, remove after we're done
'WIZARD_SITENAME': 'wgSitename',
+ 'WIZARD_META_NAMESPACE': 'wgMetaNamespace',
'WIZARD_SCRIPTPATH': 'wgScriptPath',
+ 'WIZARD_SERVER': 'wgServer',
'WIZARD_EMERGENCYCONTACT': ('wgEmergencyContact', 'wgPasswordSender'),
'WIZARD_DBSERVER': 'wgDBserver',
'WIZARD_DBNAME': 'wgDBname',
shell.call("make")
try:
result = shell.eval(
- "php", "maintenance/install.php",
+ "php", "-c", ".", "maintenance/install.php",
"--dbname", options.dsn.database,
"--dbpass", options.dsn.password,
"--dbserver", options.dsn.host,
"--dbuser", options.dsn.username,
"--email", options.email,
"--pass", options.admin_password,
- "--server", "http://" + options.web_host,
+ "--server", "https://" + options.web_host,
"--scriptpath", options.web_path,
options.title, options.admin_name,
log=True)
except shell.CallError as e:
- raise app.RecoverableInstallFailure("Install script returned non-zero exit code\nSTDOUT: %s\nSTDERR: %s" % (e.stdout, e.stderr))
+ raise app.RecoverableInstallFailure(["Install script returned non-zero exit code\nSTDOUT: %s\nSTDERR: %s" % (e.stdout, e.stderr)])
logging.debug("Install script output:\n\n" + result)
# See [Note: Maintenance script exit codes]
results = result.rstrip().split()
if not results or not results[-1] == "done":
- raise app.RecoverableInstallFailure(result)
+ raise app.RecoverableInstallFailure([result])
def install_old(self, options):
util.soft_unlink("LocalSettings.php")