Merge branch 'signing-2.0-fixes-with-build-tweaks' into 'master'

Signing 2.0 fixes with build tweaks

See merge request fdroid/fdroidserver!801

fdroidserver/common.py

@@ -134,7 +134,7 @@ default_config = {
     'stats_to_carbon': False,
     'repo_maxage': 0,
     'build_server_always': False,
-    'keystore': 'keystore.jks',
+    'keystore': 'keystore.p12',
     'smartcardoptions': [],
     'char_limits': {
         'author': 256,
@@ -3425,6 +3425,7 @@ def genkeystore(localconfig):
            '-keyalg', 'RSA', '-keysize', '4096',
            '-sigalg', 'SHA256withRSA',
            '-validity', '10000',
+           '-storetype', 'pkcs12',
            '-storepass:env', 'FDROID_KEY_STORE_PASS',
            '-dname', localconfig['keydname'],
            '-J-Duser.language=en']

fdroidserver/index.py

@@ -566,7 +566,8 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, fdroid_signing_key_fing
     with open(os.path.join(repodir, 'index.xml'), 'wb') as f:
         f.write(output)
 
-    if 'repo_keyalias' in common.config:
+    if 'repo_keyalias' in common.config \
+       or (common.options.nosign and 'repo_pubkey' in common.config):
 
         if common.options.nosign:
             logging.info(_("Creating unsigned index in preparation for signing"))