Merge branch 'master' of git+ssh://gnunet.org/gnunet

3 files changed, 17 insertions, 0 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index c78b6fe9d..676f53843 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -38,6 +38,8 @@ EXTRA_DIST = \
  conf/editors/eclipse/gnunet_codingstyle.xml \
  conf/gnunet/no_forcestart.conf \
  conf/gnunet/no_autostart_above_core.conf \
+ conf/gnunet/gnunet-system.conf \
+ conf/gnunet/gnunet-user.conf \
  conf/nss/nssswitch.conf \
  conf/wireshark/wireshark.lua \
  packages/nix/default.nix \
diff --git a/contrib/conf/gnunet/gnunet-system.conf b/contrib/conf/gnunet/gnunet-system.conf
new file mode 100644
index 000000000..6f9b0f379
--- /dev/null
+++ b/contrib/conf/gnunet/gnunet-system.conf
@@ -0,0 +1,7 @@
+# Sample configuration file to be installed in /etc/gnunet.conf
+# for a multi-user GNUnet setup.  This is then the configuration
+# for the system-wide "gnunet" user.
+[arm]
+SYSTEM_ONLY = YES
+USER_ONLY = NO
+
diff --git a/contrib/conf/gnunet/gnunet-user.conf b/contrib/conf/gnunet/gnunet-user.conf
new file mode 100644
index 000000000..de95c216c
--- /dev/null
+++ b/contrib/conf/gnunet/gnunet-user.conf
@@ -0,0 +1,8 @@
+# Sample configuration for $HOME/.config/gnunet.conf in
+# a multi-user setup. This configuration should be installed
+# in the $HOME directory of each normal user (and in
+# /etc/skel/).
+[arm]
+SYSTEM_ONLY = NO
+USER_ONLY = YES
+