diff options
author | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-09-25 17:32:05 -0400 |
---|---|---|
committer | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-09-25 17:32:05 -0400 |
commit | 1a8aa91ec38920e17e8b08470ab038de402b18de (patch) | |
tree | 38834d4967c8e06507835942151d0e7d621e1cca | |
parent | 463d0fd22c951512e3c73811961801456d7015ec (diff) | |
download | third_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.conf | 4 | ||||
-rw-r--r-- | func.spec | 2 | ||||
-rw-r--r-- | setup.py | 2 |
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 @@ -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 @@ -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, []), |