From 7bb490221a0b2b4fed0f87a46beb35766328fc32 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 31 Mar 2014 21:42:46 -0400 Subject: [PATCH] set the default keystore to the same as the default in `fdroid init` This should keep things simple and consistent. --- examples/config.py | 2 +- fdroidserver/common.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/config.py b/examples/config.py index 56b37ca6..8eb1f266 100644 --- a/examples/config.py +++ b/examples/config.py @@ -60,7 +60,7 @@ repo_keyalias = None #The keystore to use for release keys when building. This needs to be #somewhere safe and secure, and backed up! -keystore = "/home/me/somewhere/my.keystore" +#keystore = "/home/me/.local/share/fdroidserver/keystore.jks" # The password for the keystore (at least 6 characters). If this password is # different than the keypass below, it can be OK to store the password in this diff --git a/fdroidserver/common.py b/fdroidserver/common.py index a89bfdc3..7523d84f 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -66,6 +66,8 @@ def read_config(opts, config_file='config.py'): 'stats_to_carbon': False, 'repo_maxage': 0, 'build_server_always': False, + 'keystore': os.path.join(os.getenv('HOME'), + '.local', 'share', 'fdroidserver', 'keystore.jks'), 'char_limits': { 'Summary' : 50, 'Description' : 1500 -- 2.30.2