contrib: Create one unified configuration file

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 611b4f60146da4ee6973547ab6050ffac5259b15..5d6edfc0f29191cf973b98289652aff40cee4646 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -991,9 +991,7 @@ endif
 # ------------------------------------------------------------------------------
 
 dist_configs_DATA = \
-       contrib/config/client.conf \
-       contrib/config/daemon.conf \
-       contrib/config/general.conf
+       contrib/config/pakfire.conf
 
 dist_configsdistros_DATA = \
        contrib/config/distros/ipfire3.conf
@@ -1034,7 +1032,7 @@ TESTSUITE_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        $(PAKFIRE_CPPFLAGS) \
        -DABS_TOP_SRCDIR=\"$(abs_top_srcdir)\" \
-       -DTEST_CONFIG_FILE=\"$(abs_top_srcdir)/contrib/config/general.conf\" \
+       -DTEST_CONFIG_FILE=\"$(abs_top_srcdir)/contrib/config/pakfire.conf\" \
        -DTEST_DATA_DIR=\"$(abs_top_srcdir)/tests/data\" \
        -DTEST_ROOTFS=\"$(TEST_ROOTFS)\" \
        -DTEST_STUB_COMMAND=\"$(abs_top_builddir)/tests/stub/root/command\" \

diff --git a/contrib/config/client.conf b/contrib/config/client.conf
deleted file mode 100644 (file)
index 503d0e1..0000000
--- a/contrib/config/client.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Configure the pakfire client.
-[client]
-
-# The URL of the server to connect to.
-# server = https://pakfire.ipfire.org/
-
-# Your credentials to log in on the hub
-# keytab = /etc/pakfire/pakfire.keytab (defaults to /etc/krb5.keytab)

diff --git a/contrib/config/daemon.conf b/contrib/config/daemon.conf
deleted file mode 100644 (file)
index ec80e35..0000000
--- a/contrib/config/daemon.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# Configure the pakfire daemon.
-[daemon]
-
-# The URL of the server to connect to.
-# server = https://pakfire.ipfire.org/
-
-# The keytab file that is being used to authenticate against the Hub
-keytab = /etc/krb5.keytab
-
-# The default path for ccaches
-ccache_path = /var/cache/pakfire/ccache

diff --git a/contrib/config/general.conf b/contrib/config/general.conf
deleted file mode 100644 (file)
index 38ab915..0000000
--- a/contrib/config/general.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# This is the general configuration file for Pakfire
-
-# Pakfire can use a proxy for HTTPS and HTTP
-# If no proxy setting is configured, Pakfire will
-# use the environment settings.
-#proxy = http://192.168.180.1:800

diff --git a/contrib/config/pakfire.conf b/contrib/config/pakfire.conf
new file mode 100644 (file)
index 0000000..d44e568
--- /dev/null
+++ b/contrib/config/pakfire.conf
@@ -0,0 +1,18 @@
+###############################################################################
+# Configuration File for Pakfire                                              #
+###############################################################################
+
+# General Configuration Options
+[general]
+
+# Proxy (HTTPS + HTTP)
+#proxy = http://192.168.180.1:800
+
+# Pakfire Client Configuration
+[client]
+
+# The URL of the Build Service to connect to
+url = https://pakfire.ipfire.org
+
+# Your credentials to log in (defaults to /etc/krb5.keytab)
+# keytab = /etc/krb5.keytab