Place more examples/config.py stuff into the defaults

diff --git a/examples/config.py b/examples/config.py
index 221b63bf336630ae31041acdd9da98a1debfc168..ed34e6488baa0f15a78ad8f58683c82fd0327369 100644 (file)
--- a/examples/config.py
+++ b/examples/config.py
@@ -33,12 +33,10 @@ repo_maxage = 0
 repo_url = "https://MyFirstFDroidRepo.org/fdroid/repo"
 repo_name = "My First FDroid Repo Demo"
 repo_icon = "fdroid-icon.png"
-repo_description = """
-This is a repository of apps to be used with FDroid. Applications in this
-repository are either official binaries built by the original application
-developers, or are binaries built from source by the admin of f-droid.org
-using the tools on https://gitlab.com/u/fdroid.
-"""
+repo_description = "This is a repository of apps to be used with FDroid. Applications in this "
+"repository are either official binaries built by the original application "
+"developers, or are binaries built from source by the admin of f-droid.org "
+"using the tools on https://gitlab.com/u/fdroid."
 
 # As above, but for the archive repo.
 # archive_older sets the number of versions kept in the main repo, with all

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index afafffdf8e3e9d0d3ce8402cf70c8a0f376a768e..2c8b67951632ff095adb016baecf46c700a6e663 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -46,7 +46,6 @@ def get_default_config():
         'ant': "ant",
         'mvn3': "mvn",
         'gradle': 'gradle',
-        'archive_older': 0,
         'sync_from_local_copy_dir': False,
         'update_stats': False,
         'stats_to_carbon': False,
@@ -59,6 +58,15 @@ def get_default_config():
             'Description': 1500
         },
         'keyaliases': {},
+        'repo_url': "https://MyFirstFDroidRepo.org/fdroid/repo",
+        'repo_name': "My First FDroid Repo Demo",
+        'repo_icon': "fdroid-icon.png",
+        'repo_description':
+            "This is a repository of apps to be used with FDroid. Applications in this "
+            "repository are either official binaries built by the original application "
+            "developers, or are binaries built from source by the admin of f-droid.org "
+            "using the tools on https://gitlab.com/u/fdroid.",
+            'archive_older': 0,
     }