From 967f120791f8f813890b83b2d767f0b3e682edea Mon Sep 17 00:00:00 2001
From: Seth Vidal <skvidal@fedoraproject.org>
Date: Thu, 18 Oct 2007 10:45:02 -0400
Subject: swap out minion-acl config file for minion-acl.d dir of .acl files

---
 etc/minion-acl.conf | 5 -----
 etc/minion.conf     | 3 ++-
 etc/sample.acl      | 5 +++++
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 etc/minion-acl.conf
 create mode 100644 etc/sample.acl

(limited to 'etc')

diff --git a/etc/minion-acl.conf b/etc/minion-acl.conf
deleted file mode 100644
index 1a093a8..0000000
--- a/etc/minion-acl.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#config file for minion Access control lists
-#this specifies which methods a connecting client is allowed to run
-# format is: cn-certificate-hash = method1, method2, method3
-# default allows the certmaster key to run all methods
-
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/sample.acl b/etc/sample.acl
new file mode 100644
index 0000000..1a093a8
--- /dev/null
+++ b/etc/sample.acl
@@ -0,0 +1,5 @@
+#config file for minion Access control lists
+#this specifies which methods a connecting client is allowed to run
+# format is: cn-certificate-hash = method1, method2, method3
+# default allows the certmaster key to run all methods
+
-- 
cgit