From: Ciaran Gultnieks Date: Tue, 9 Jul 2013 07:59:58 +0000 (+0100) Subject: Use https for wiki updates X-Git-Tag: 0.1~513 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b9fa583c9964cbd57fa0b7e05dbe0b615b46d367;p=fdroidserver.git Use https for wiki updates --- diff --git a/config.sample.py b/config.sample.py index 63bdb5d7..57285501 100644 --- 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 7086b7e2..edb210b9 100644 --- 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 8fbff715..9b66a3df 100644 --- 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: