Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func

2 files changed, 2 insertions, 0 deletions

diff --git a/func.spec b/func.spec
index 61cb2e4..c889fce 100644
--- a/func.spec
+++ b/func.spec
@@ -43,6 +43,7 @@ rm -fr $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/pki/%{name}
 %config(noreplace) /etc/func/minion.conf
+%config(noreplace) /etc/func/minion-acl.conf
 %config(noreplace) /etc/func/certmaster.conf
 %config(noreplace) /etc/logrotate.d/func_rotate
 %dir %{python_sitelib}/func
diff --git a/setup.py b/setup.py
index fb243af..0170dd4 100644
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,7 @@ if __name__ == "__main__":
                               (initpath, ["init-scripts/certmaster"]),
                               (etcpath,  ["etc/minion.conf"]),
                               (etcpath,  ["etc/certmaster.conf"]),
+                              (etcpath,  ["etc/minion-acl.conf"]),
                               (manpath,  ["docs/func.1.gz"]),
                               (manpath,  ["docs/funcd.1.gz"]),
                               (manpath,  ["docs/certmaster.1.gz"]),