Restructure contrib folder.

contrib/pogen.sh -> bin/pogen.sh
bootstrap: Use new pogen location and execute it.
contrib/openvpn-tap32: Move to contrib/3rdparty/Windows/openvpn-tap32.
contrib/gnunet-logo*: Move to contrib/branding/logo/
Delete old patches in contrib, predating git.
Move buildbot data to contrib/ci/buildbot,
move docker data to contrib/ci/docker.
Create contrib/conf and populate it with config files found in contrib and bin.
Move gns related data to contrib/gns.
delete contrib/repeat.sh
Move contrib/log.php into contrib/web/log.php.
Create folder contrib/scripts and use it for most scripts in contrib.
Remove trailing whitespace in doc/Makefile.am

Signed-off-by: Nils Gillmann <ng0@n0.is>

2 files changed, 131 insertions, 0 deletions

diff --git a/contrib/conf/gnunet/no_autostart_above_core.conf b/contrib/conf/gnunet/no_autostart_above_core.conf
new file mode 100644
index 000000000..7bcf6c8ae
--- /dev/null
+++ b/contrib/conf/gnunet/no_autostart_above_core.conf
@@ -0,0 +1,90 @@
+# Configuration to disable autostarting of
+# all services above the 'core' level.
+# (including resolver)
+
+[dns]
+AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO
+
+[cadet]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[fs]
+AUTOSTART = NO
+
+[dv]
+AUTOSTART = NO
+
+[vpn]
+AUTOSTART = NO
+
+[consensus]
+AUTOSTART = NO
+
+[resolver]
+AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
+
+[namecache]
+AUTOSTART = NO
+
+[identity]
+AUTOSTART = NO
+
+[revocation]
+AUTOSTART = NO
+
+[conversation]
+AUTOSTART = NO
+
+[peerstore]
+AUTOSTART = NO
+
+[psycstore]
+AUTOSTART = NO
+
+[gns]
+AUTOSTART = NO
+
+[regex]
+AUTOSTART = NO
+
+[set]
+AUTOSTART = NO
+
+[scalarproduct-bob]
+AUTOSTART = NO
+
+[scalarproduct-alice]
+AUTOSTART = NO
+
+[social]
+AUTOSTART = NO
+
+[psyc]
+AUTOSTART = NO
+
+[rps]
+AUTOSTART = NO
+
+[multicast]
+AUTOSTART = NO
+
+[sensordashboard]
+AUTOSTART = NO
+
+[sensor]
+AUTOSTART = NO
+
+[zonemaster-monitor]
+AUTOSTART = NO
diff --git a/contrib/conf/gnunet/no_forcestart.conf b/contrib/conf/gnunet/no_forcestart.conf
new file mode 100644
index 000000000..a332d6da7
--- /dev/null
+++ b/contrib/conf/gnunet/no_forcestart.conf
@@ -0,0 +1,41 @@
+# Configuration file that can be included to prevent ANY of the usual
+# FORCESTART = YES to be set.  Also disables NSE POW calculation.
+#
+# This configuration is included from various configuration test files.
+# Whenever a new service is added that has FORCESTART = YES for
+# production should be disabled for (most) test suites, the option should
+# be added here instead of all over the place ;-).
+
+[core]
+FORCESTART = NO
+
+[fs]
+FORCESTART = NO
+
+[dht]
+FORCESTART = NO
+
+[cadet]
+FORCESTART = NO
+
+[nse]
+FORCESTART = NO
+WORKBITS = 0
+
+[revocation]
+FORCESTART = NO
+
+[topology]
+FORCESTART = NO
+
+[hostlist]
+FORCESTART = NO
+
+[gns]
+FORCESTART = NO
+
+[zonemaster]
+FORCESTART = NO
+
+[zonemaster-monitor]
+FORCESTART = NO