diff options
| -rw-r--r-- | AUTHORS | 3 | ||||
| -rw-r--r-- | MANIFEST.in | 2 | ||||
| -rw-r--r-- | etc/minion.conf (renamed from settings) | 0 | ||||
| -rwxr-xr-x | minion/config_data.py | 2 |
4 files changed, 4 insertions, 3 deletions
@@ -1,9 +1,10 @@ func is written by (alphabetically) ... + James Bowes <jbowes@redhat.com> Michael DeHaan <mdehaan@redhat.com> Adrian Likins <alikins@redhat.com> - Scott Sseago <sseago@redhat.com> + Robin Norwood <rnorwood@redhat.com> Seth Vidal <skvidal@redhat.com> ... (committers: please add yourself) diff --git a/MANIFEST.in b/MANIFEST.in index c3a587c..e2dc4ea 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ -include settings include version +include etc/minion.conf include etc/certmaster.conf recursive-include docs * recursive-include init-scripts * diff --git a/settings b/etc/minion.conf index 8177535..8177535 100644 --- a/settings +++ b/etc/minion.conf diff --git a/minion/config_data.py b/minion/config_data.py index 021a52d..2f34c5c 100755 --- a/minion/config_data.py +++ b/minion/config_data.py @@ -17,7 +17,7 @@ import codes import os import ConfigParser -CONFIG_FILE = "/etc/func/settings" +CONFIG_FILE = "/etc/func/minion.conf" class Config: |