X-Git-Url: https://scripts.mit.edu/gitweb/wizard.git/blobdiff_plain/10fea9a7ddab6a654922514b13b135772cc98a01..5f835f44034f079fe644879e8c27580a48e937cd:/wizard/app/mediawiki.py

diff --git a/wizard/app/mediawiki.py b/wizard/app/mediawiki.py
index 935a1ee..83018ce 100644
--- a/wizard/app/mediawiki.py
+++ b/wizard/app/mediawiki.py
@@ -24,7 +24,9 @@ def make_filename_regex(var):
 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',
@@ -35,6 +37,7 @@ seed = util.dictmap(make_filename_regex, {
         })
 
 class Application(app.Application):
+    fullname = "MediaWiki"
     database = "mysql"
     parametrized_files = ['LocalSettings.php'] + php.parametrized_files
     deprecated_keys = set(['WIZARD_IP']) | php.deprecated_keys
@@ -61,26 +64,29 @@ class Application(app.Application):
             self.install_old(options)
     def install_1_17_0(self, options):
         util.soft_unlink("LocalSettings.php")
+        if os.path.exists("math"):
+            with util.ChangeDirectory("math"):
+                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")
@@ -115,6 +121,9 @@ class Application(app.Application):
     def upgrade(self, d, version, options):
         if not os.path.isfile("AdminSettings.php"):
             shell.call("git", "checkout", "-q", "mediawiki-" + str(version), "--", "AdminSettings.php")
+        if os.path.exists("math"):
+            with util.ChangeDirectory("math"):
+                shell.call("make")
         try:
             result = shell.eval("php", "maintenance/update.php", "--quick", log=True)
         except shell.CallError as e: