summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-09-25 17:32:05 -0400
committerMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-09-25 17:32:05 -0400
commit1a8aa91ec38920e17e8b08470ab038de402b18de (patch)
tree38834d4967c8e06507835942151d0e7d621e1cca
parent463d0fd22c951512e3c73811961801456d7015ec (diff)
downloadthird_party-func-1a8aa91ec38920e17e8b08470ab038de402b18de.tar.gz
third_party-func-1a8aa91ec38920e17e8b08470ab038de402b18de.tar.xz
third_party-func-1a8aa91ec38920e17e8b08470ab038de402b18de.zip
Updating configuration files to keep things seperate.
-rw-r--r--etc/minion.conf4
-rw-r--r--func.spec2
-rw-r--r--setup.py2
3 files changed, 3 insertions, 5 deletions
diff --git a/etc/minion.conf b/etc/minion.conf
index 8177535..be9d412 100644
--- a/etc/minion.conf
+++ b/etc/minion.conf
@@ -1,7 +1,5 @@
-# configuration for overlord servers
+# configuration for minions
[general]
-is_overlord = 0
-is_minion = 1
overlord_server = funcmaster
log_level = DEBUG
diff --git a/func.spec b/func.spec
index 30c6ab8..8580018 100644
--- a/func.spec
+++ b/func.spec
@@ -39,7 +39,7 @@ rm -fr $RPM_BUILD_ROOT
%{_bindir}/certmaster
/etc/init.d/funcd
/etc/init.d/certmaster
-%config(noreplace) /etc/func/settings
+%config(noreplace) /etc/func/minion.conf
%config(noreplace) /etc/func/certmaster.conf
%dir %{python_sitelib}/func
%dir %{python_sitelib}/func/minion
diff --git a/setup.py b/setup.py
index 8fcd0ca..4c34d9a 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ if __name__ == "__main__":
"%s/minion/modules" % NAME
],
data_files = [(initpath, ["init-scripts/funcd", "init-scripts/certmaster"]),
- (etcpath, ["settings","etc/certmaster.conf"]),
+ (etcpath, ["etc/minion.conf","etc/certmaster.conf"]),
(etcpathdb, []),
(logpath, []),
(logpathdb, []),