summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorAdrian Likins <alikins@grimlock.devel.redhat.com>2007-10-08 15:38:27 -0400
committerAdrian Likins <alikins@grimlock.devel.redhat.com>2007-10-08 15:38:27 -0400
commitacc98aeb6d460720cd05b15795b7239d44f03a11 (patch)
treec284d1caa0e8c857ae1139ea8c2551dfa5b9d6ac /etc
parentb0cb5b7a380c9ba1a6b2ca328f7f2f5da4a87e80 (diff)
parent4c2f82e9c96c8b5fdd8ef13bf5f11418511f82e5 (diff)
downloadthird_party-func-acc98aeb6d460720cd05b15795b7239d44f03a11.tar.gz
third_party-func-acc98aeb6d460720cd05b15795b7239d44f03a11.tar.xz
third_party-func-acc98aeb6d460720cd05b15795b7239d44f03a11.zip
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
Diffstat (limited to 'etc')
-rw-r--r--etc/minion-acl.conf5
-rw-r--r--etc/minion.conf2
2 files changed, 6 insertions, 1 deletions
diff --git a/etc/minion-acl.conf b/etc/minion-acl.conf
new file mode 100644
index 0000000..1a093a8
--- /dev/null
+++ b/etc/minion-acl.conf
@@ -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
+
diff --git a/etc/minion.conf b/etc/minion.conf
index 9e18eac..dc4c0a1 100644
--- a/etc/minion.conf
+++ b/etc/minion.conf
@@ -4,4 +4,4 @@
log_level = DEBUG
certmaster = certmaster
cert_dir = /etc/pki/func
-
+acl_config = /etc/func/minion-acl.conf