set the default keystore to the same as the default in `fdroid init`

This should keep things simple and consistent.

diff --git a/examples/config.py b/examples/config.py
index 56b37ca6314d88a4742294a8ab0435a6df9d1646..8eb1f266935a505e3287ff2f292f697df45d4692 100644 (file)
--- 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 a89bfdc364729a12d9e7dac101c5c9f199577e44..7523d84f1905e593f279c28cbd33ad59ce37d087 100644 (file)
--- 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