summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorSeth Vidal <skvidal@fedoraproject.org>2007-10-18 10:45:02 -0400
committerSeth Vidal <skvidal@fedoraproject.org>2007-10-18 10:45:02 -0400
commit967f120791f8f813890b83b2d767f0b3e682edea (patch)
tree1ec4f004935669cc9a2d2cd7903c992a36f30fe5 /etc
parentb4b771c5aced0739eb7a875bf126d21dbdaff06b (diff)
downloadfunc-967f120791f8f813890b83b2d767f0b3e682edea.tar.gz
func-967f120791f8f813890b83b2d767f0b3e682edea.tar.xz
func-967f120791f8f813890b83b2d767f0b3e682edea.zip
swap out minion-acl config file for minion-acl.d dir of .acl files
Diffstat (limited to 'etc')
-rw-r--r--etc/minion.conf3
-rw-r--r--etc/sample.acl (renamed from etc/minion-acl.conf)0
2 files changed, 2 insertions, 1 deletions
diff --git a/etc/minion.conf b/etc/minion.conf
index dc4c0a1..f2e2b34 100644
--- a/etc/minion.conf
+++ b/etc/minion.conf
@@ -4,4 +4,5 @@
log_level = DEBUG
certmaster = certmaster
cert_dir = /etc/pki/func
-acl_config = /etc/func/minion-acl.conf
+acl_dir = /etc/func/minion-acl.d
+
diff --git a/etc/minion-acl.conf b/etc/sample.acl
index 1a093a8..1a093a8 100644
--- a/etc/minion-acl.conf
+++ b/etc/sample.acl