Revert "all: add NDK r12b and set it as default"

[fdroidserver.git] / examples / config.py

diff --git a/examples/config.py b/examples/config.py
index 536bcc19b66f92856a7239491649c709124ebabf..97628e7e0ad8f97d394c75ac1dae9262d667716b 100644 (file)
--- a/examples/config.py
+++ b/examples/config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # Copy this file to config.py, then amend the settings below according to
 # your system configuration.
@@ -15,8 +15,16 @@
 #     'r10e': "$ANDROID_NDK",
 # }
 
+# java_paths = {
+#     '1.8': "/usr/lib/jvm/java-8-openjdk",
+# }
+
 # Build tools version to be used
-# build_tools = "23.0.1"
+# build_tools = "24.0.0"
+
+# Force all build to use the above version of build -tools, good for testing
+# builds without having all of the possible build-tools installed.
+# force_build_tools = True
 
 # Command or path to binary for running Ant
 # ant = "ant"
@@ -141,6 +149,18 @@ The repository of older versions of applications from the main demo repository.
 #     'bar.info:/var/www/fdroid',
 #     }
 
+# Any mirrors of this repo, for example all of the servers declared in
+# serverwebroot, will automatically be used by the client.  If one
+# mirror is not working, then the client will try another.  If the
+# client has Tor enabled, then the client will prefer mirrors with
+# .onion addresses. This base URL will be used for both the main repo
+# and the archive, if it is enabled.  So these URLs should end in the
+# 'fdroid' base of the F-Droid part of the web server like serverwebroot.
+#
+# mirrors = {
+#     'https://foo.bar/fdroid',
+#     'http://foobarfoobarfoobar.onion/fdroid',
+# }
 
 # optionally specific which identity file to use when using rsync over SSH
 #
@@ -213,10 +233,10 @@ The repository of older versions of applications from the main demo repository.
 # --server option on dedicated secure build server hosts.
 # build_server_always = True
 
-# By default, fdroid will use YAML and the custom .txt metadata formats. It
+# By default, fdroid will use YAML .yml and the custom .txt metadata formats. It
 # is also possible to have metadata in JSON and XML by adding 'json' and
 # 'xml'.
-# accepted_formats = ['txt', 'yaml']
+# accepted_formats = ['txt', 'yml']
 
 # Limit in number of characters that fields can take up
 # Only the fields listed here are supported, defaults shown