sync repo examples with defaults and comment out example repo settings

!359

CHANGELOG.md

@@ -69,6 +69,7 @@ milestone](https://gitlab.com/fdroid/fdroidserver/-/milestones/10)
   ([!692](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/692))
 * Major refactoring on core parts of code to be more Pythonic
   ([!756](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/756))
+* `fdroid init` now works when installed with pip
 
 ### Removed
 * Removed all support for _.txt_ and _.json_ metadata

examples/config.yml

@@ -52,23 +52,27 @@
 # The same policy is applied to the archive repo, if there is one.
 # repo_maxage: 0
 
-repo_url: https://MyFirstFDroidRepo.org/fdroid/repo
+# repo_url: https://MyFirstFDroidRepo.org/fdroid/repo
-repo_name: My First F-Droid Repo Demo
+# repo_name: My First F-Droid Repo Demo
-repo_description: >-
+# repo_description: >-
-  This is a repository of apps to be used with F-Droid. Applications in this
+#   This is a repository of apps to be used with F-Droid. Applications
-  repository are either official binaries built by the original application
+#   in this repository are either official binaries built by the
-  developers, or are binaries built from source by the admin of f-droid.org
+#   original application developers, or are binaries built from source
-  using the tools on https://gitlab.com/u/fdroid.
+#   by the admin of f-droid.org using the tools on
+#   https://gitlab.com/fdroid.
 
 # As above, but for the archive repo.
+#
+# archive_url: https://f-droid.org/archive
+# archive_name: My First F-Droid Archive Demo
+# archive_description: >-
+#   The repository of older versions of packages from the main demo repository.
+
 # archive_older sets the number of versions kept in the main repo, with all
 # older ones going to the archive. Set it to 0, and there will be no archive
 # repository, and no need to define the other archive_ values.
-archive_older: 3
+#
-archive_url: https://f-droid.org/archive
+# archive_older: 3
-archive_name: My First F-Droid Archive Demo
-archive_description: >-
-  The repository of older versions of packages from the main demo repository.
 
 # The repo's icon defaults to a file called 'icon.png' in the 'icons'
 # folder for each section, e.g. repo/icons/icon.png and

fdroidserver/common.py

@@ -146,14 +146,10 @@ default_config = {
     },
     'keyaliases': {},
     'repo_url': "https://MyFirstFDroidRepo.org/fdroid/repo",
-    'repo_name': "My First FDroid Repo Demo",
+    'repo_name': "My First F-Droid Repo Demo",
     'repo_icon': "icon.png",
-    'repo_description': _('''
+    'repo_description': _("""This is a repository of apps to be used with F-Droid. 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/fdroid."""),
-        This is a repository of apps to be used with FDroid. Applications in this
+    'archive_name': 'My First F-Droid Archive Demo',
-        repository are either official binaries built by the original application
-        developers, or are binaries built from source by f-droid.org using the
-        tools on https://gitlab.com/fdroid.
-        '''),
     'archive_description': _('These are the apps that have been archived from the main repo.'),
     'archive_older': 0,
     'lint_licenses': fdroidserver.lint.APPROVED_LICENSES,

fdroidserver/index.py

@@ -76,9 +76,10 @@ def make(apps, apks, repodir, archive):
     if archive:
         repodict['name'] = common.config['archive_name']
         repodict['icon'] = common.config.get('archive_icon', common.default_config['repo_icon'])
-        repodict['address'] = common.config['archive_url']
         repodict['description'] = common.config['archive_description']
-        urlbasepath = os.path.basename(urllib.parse.urlparse(common.config['archive_url']).path)
+        archive_url = common.config.get('archive_url', common.config['repo_url'][:-4] + 'archive')
+        repodict['address'] = archive_url
+        urlbasepath = os.path.basename(urllib.parse.urlparse(archive_url).path)
     else:
         repodict['name'] = common.config['repo_name']
         repodict['icon'] = common.config.get('repo_icon', common.default_config['repo_icon'])

tests/repo/index-v1.json

@@ -5,7 +5,7 @@
     "name": "My First F-Droid Repo Demo",
     "icon": "icon.png",
     "address": "https://MyFirstFDroidRepo.org/fdroid/repo",
-    "description": "This is a repository of apps to be used with F-Droid. 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.",
+    "description": "This is a repository of apps to be used with F-Droid. 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/fdroid.",
     "mirrors": [
       "http://foobarfoobarfoobar.onion/fdroid/repo",
       "https://foo.bar/fdroid/repo"

tests/repo/index.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fdroid>
 	<repo icon="icon.png" name="My First F-Droid Repo Demo" pubkey="308204e1308202c9a003020102020434597643300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b06035504031304736f7661301e170d3136303931333230313930395a170d3434303133303230313930395a30213110300e060355040b1307462d44726f6964310d300b06035504031304736f766130820222300d06092a864886f70d01010105000382020f003082020a028202010086ef94b5aacf2ba4f38c875f4194b44f5644392e3715575d7c92828577e692c352b567172823851c8c72347fbc9d99684cd7ca3e1db3e4cca126382c53f2a5869fb4c19bdec989b2930501af3e758ff40588915fe96b10076ce3346a193a0277d79e83e30fd8657c20e35260dd085aa32eac7c4b85786ffefbf1555cafe2bc928443430cdbba48cfbe701e12ae86e676477932730d4fc7c00af820aef85038a5b4df084cf6470d110dc4c49ea1b749b80b34709d199b3db516b223625c5de4501e861f7d261b3838f8f616aa78831d618d41d25872dc810c9b2087b5a9e146ca95be740316dcdbcb77314e23ab87d4487913b800b1113c0603ea2294188b71d3e49875df097b56f9151211fc6832f9790c5c83d17481f14ad37915fd164f4fd713f6732a15f4245714b84cd665bdbd085660ea33ad7d7095dcc414f09e3903604a40facc2314a115c0045bb50e9df38efb57e1b8e7cc105f340a26eeb46aba0fa6672953eee7f1f92dcb408e561909bbd4bdf4a4948c4d57c467d21aa238c34ba43be050398be963191fa2b49828bc1e4eeed224b40dbe9dc3e570890a71a974a2f4527edb1b07105071755105edcb2af2f269facfb89180903a572a99b46456e80d4a01685a80b233278805f2c876678e731f4ec4f52075aeef6b2b023efbb8a3637ef507c4c37c27e428152ec1817fcba640ad601cb09f72f0fbe2d274a2410203010001a321301f301d0603551d0e04160414c28bf33dd5a9a17338e5b1d1a6edd8c7d141ed0b300d06092a864886f70d01010b0500038202010084e20458b2aafd7fc27146b0986f9324f4260f244920417a77c9bf15e2e2d22d2725bdd8093ec261c3779c3ca03312516506f9410075b90595b41345956d8eb2786fb5994f195611382c2b99dba13381b0100a30bc9e6e47248bf4325e2f6eec9d789216dc7536e753bf1f4be603d9fa2e6f5e192b4eb988b8cdb0bb1e8668a9225426f7d4636479f73ed24ad1d2657c31e63c93d9679b9080171b3bd1bf10a3b92b80bd790fbf62d3644900cd08eae8b9bf9c2567be98dc8cdd2ae19a8d57a3e3e2de899f81f1279f578989e6af906f80c8c2b67651730ee7e568c1af5bcb845b6d685dc55332a9984aeceaea3b7e883447edf1c76b155d95253e39b9710eaa22efa6c81468829702b5dce7126538f3ca70c2f0ad9a5795435fdb1f715f20d60359ef9a9926c7050116e802df651727447848827815f70bd82af3cedd08783156102d2d8ce995c4c43b8e47e91a3e6927f3505a5d395e6bebb84542c570903eeab4382a1c2151f1471c7a06a34dc4d268d8fa72e93bdcd2dccc4302ecac47b9e7e3d8bc9b46d21cd097874a24d529548018dc190ff568c6aa428f0a5eedff1a347730931c74f19277538e49647a4ad7254f4c1ec7d4da12cce9e1fad9607534e66ab40a56b473d9d7e3d563fd03cad2052bad365c5a29f8ae54f09b60dbca3ea768d7767cbe1c133ca08ce725c1c1370f4aab8e5b6e286f52dc0be8d0982b5a" timestamp="1480431575" url="https://MyFirstFDroidRepo.org/fdroid/repo" version="20000">
-		<description>This is a repository of apps to be used with F-Droid. 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.</description>
+		<description>This is a repository of apps to be used with F-Droid. 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/fdroid.</description>
 		<mirror>http://foobarfoobarfoobar.onion/fdroid/repo</mirror>
 		<mirror>https://foo.bar/fdroid/repo</mirror>
 	</repo>

tests/run-tests

@@ -309,7 +309,7 @@ cp $WORKSPACE/tests/urzip.apk \
    $WORKSPACE/tests/repo/com.politedroid_[0-9].apk \
    $WORKSPACE/tests/repo/obb.main.twoversions_110161[357].apk \
    repo/
-$sed -i.tmp 's,archive_older: [0-9],archive_older: 3,' config.yml
+printf '\narchive_older: 3\n' >> config.yml
 
 $fdroid update --pretty --nosign
 if which apksigner; then
@@ -332,7 +332,7 @@ if ! which apksigner; then
     cp $WORKSPACE/tests/metadata/com.politedroid.yml metadata/
     test -d repo || mkdir repo
     cp $WORKSPACE/tests/repo/com.politedroid_[0-9].apk repo/
-    $sed -i.tmp 's,archive_older: [0-9],archive_older: 3,' config.yml
+    printf '\narchive_older: 3\n' >> config.yml
 
     $fdroid update --pretty --nosign
     test `grep '<package>' archive/index.xml | wc -l` -eq 0
@@ -418,7 +418,7 @@ cp $WORKSPACE/tests/metadata/com.politedroid.yml metadata/
 $sed -i.tmp '/ArchivePolicy:/d' metadata/com.politedroid.yml
 test -d repo || mkdir repo
 cp $WORKSPACE/tests/repo/com.politedroid_[0-9].apk repo/
-$sed -i.tmp 's,archive_older: [0-9],archive_older: 3,' config.yml
+printf '\narchive_older: 3\n' >> config.yml
 
 $fdroid update --pretty --nosign
 test `grep '<package>' archive/index.xml | wc -l` -eq 1
@@ -494,7 +494,7 @@ REPOROOT=`create_test_dir`
 cd $REPOROOT
 fdroid_init_with_prebuilt_keystore
 echo 'allow_disabled_algorithms: true' >> config.yml
-$sed -i.tmp 's,archive_older: [0-9],archive_older: 3,' config.yml
+printf '\narchive_older: 3\n' >> config.yml
 test -d metadata || mkdir metadata
 cp $WORKSPACE/tests/metadata/com.politedroid.yml metadata/
 echo 'Summary: good test version of urzip' > metadata/info.guardianproject.urzip.yml
@@ -615,6 +615,7 @@ echo_header "test for added date being set correctly for repo and archive"
 REPOROOT=`create_test_dir`
 cd $REPOROOT
 fdroid_init_with_prebuilt_keystore
+printf '\narchive_older: 3\n' >> config.yml
 mkdir -p {repo,archive,metadata,stats}
 cp $WORKSPACE/tests/repo/com.politedroid_5.apk archive
 cp $WORKSPACE/tests/repo/com.politedroid_6.apk repo
@@ -1125,6 +1126,7 @@ REPOROOT=`create_test_dir`
 GIT_MIRROR=$REPOROOT/git-mirror
 cd $REPOROOT
 fdroid_init_with_prebuilt_keystore
+printf '\narchive_older: 3\n' >> config.yml
 echo "servergitmirrors: $SERVER_GIT_MIRROR" >> config.yml
 
 cp $WORKSPACE/tests/repo/com.politedroid_[345].apk repo/
@@ -1193,6 +1195,7 @@ if have_git_2_3; then
 
     cd $OFFLINE_ROOT
     fdroid_init_with_prebuilt_keystore
+    printf '\narchive_older: 3\n' >> config.yml
     cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $WORKSPACE/tests/stats $OFFLINE_ROOT/
 
     echo "mirrors: ['http://foo.bar/fdroid', 'http://asdflkdsfjafdsdfhkjh.onion/fdroid']" >> config.yml
@@ -1282,6 +1285,7 @@ if which wget; then
     # clean up
     kill -9 $http_server_pid
     rm -f 127.0.0.1\:${port}/repo/*.apk 127.0.0.1\:${port}/repo/*/*/*/*.png
+    sleep 1  # wait for webserver thread to quit
 else
     echo "WARNING: wget not installed, skipping"
 fi