Use https for wiki updates

diff --git a/config.sample.py b/config.sample.py
index 63bdb5d71830f4cadd093eccff24671ee0376215..5728550144a59eca9200ffe62c65cccfcf626043 100644 (file)
--- a/config.sample.py
+++ b/config.sample.py
@@ -66,6 +66,7 @@ keyaliases['com.example.another.plugin'] = '@com.example.another'
 serverwebroot = 'user@example:/var/www/repo'
 
 #Wiki details
+wiki_protocol = "http"
 wiki_server = "server"
 wiki_path = "/wiki/"
 wiki_user = "login"

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 7086b7e2b0c3a8b354557a1bf4016f5087ae228d..edb210b9e1b1c30a5c5d3fda35f53332a708eb88 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -663,7 +663,7 @@ def main():
 
     if options.wiki:
         import mwclient
-        site = mwclient.Site(wiki_server, path=wiki_path)
+        site = mwclient.Site((wiki_protocol, wiki_server), path=wiki_path)
         site.login(wiki_user, wiki_password)
 
     # Build applications...

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 8fbff715b96ff62b70c79b77a70336781cf979e9..9b66a3df576335cdf31398abea1c2694ce8ad069 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -42,7 +42,7 @@ def update_wiki(apps, apks, verbose=False):
     print "Updating wiki"
     wikicat = 'Apps'
     import mwclient
-    site = mwclient.Site(wiki_server, path=wiki_path)
+    site = mwclient.Site((wiki_protocol, wiki_server), path=wiki_path)
     site.login(wiki_user, wiki_password)
     generated_pages = {}
     for app in apps: