summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Vidal <skvidal@fedoraproject.org>2007-09-25 15:42:25 -0400
committerSeth Vidal <skvidal@fedoraproject.org>2007-09-25 15:42:25 -0400
commit4d36563e61ab0d0b6617aae18c9a6962701c6c59 (patch)
tree12cd003c923e5943f30468d7b19baf52bd67a997
parentaff256641a5b3f461b7d76ce706395eb09936405 (diff)
downloadthird_party-func-4d36563e61ab0d0b6617aae18c9a6962701c6c59.tar.gz
third_party-func-4d36563e61ab0d0b6617aae18c9a6962701c6c59.tar.xz
third_party-func-4d36563e61ab0d0b6617aae18c9a6962701c6c59.zip
add etc/certmaster.conf
fix setup.py and func.spec for it
-rw-r--r--MANIFEST.in1
-rw-r--r--func.spec1
-rw-r--r--setup.py2
3 files changed, 3 insertions, 1 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 0c3c56d..c3a587c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
include settings
include version
+include etc/certmaster.conf
recursive-include docs *
recursive-include init-scripts *
recursive-include po *.po
diff --git a/func.spec b/func.spec
index 52ec37a..c516fb9 100644
--- a/func.spec
+++ b/func.spec
@@ -39,6 +39,7 @@ rm -fr $RPM_BUILD_ROOT
/etc/init.d/funcd
/etc/init.d/certmaster
%config(noreplace) /etc/func/settings
+%config(noreplace) /etc/func/certmaster.conf
%dir %{python_sitelib}/func
%dir %{python_sitelib}/func/minion
%dir %{python_sitelib}/func/overlord
diff --git a/setup.py b/setup.py
index d487a1a..156b824 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",]),
+ (etcpath, ["settings","etc/certmaster.conf"]),
(etcpathdb, []),
(logpath, []),
(logpathdb, []),