From 463d0fd22c951512e3c73811961801456d7015ec Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Tue, 25 Sep 2007 17:30:34 -0400 Subject: Update AUTHORS list (everyone else free to add you as you add stuff) --- AUTHORS | 3 ++- MANIFEST.in | 2 +- etc/minion.conf | 7 +++++++ minion/config_data.py | 2 +- settings | 7 ------- 5 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 etc/minion.conf delete mode 100644 settings diff --git a/AUTHORS b/AUTHORS index afa7071..b4539ca 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,9 +1,10 @@ func is written by (alphabetically) ... + James Bowes Michael DeHaan Adrian Likins - Scott Sseago + Robin Norwood Seth Vidal ... (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/etc/minion.conf b/etc/minion.conf new file mode 100644 index 0000000..8177535 --- /dev/null +++ b/etc/minion.conf @@ -0,0 +1,7 @@ +# configuration for overlord servers + +[general] +is_overlord = 0 +is_minion = 1 +overlord_server = funcmaster +log_level = DEBUG 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: diff --git a/settings b/settings deleted file mode 100644 index 8177535..0000000 --- a/settings +++ /dev/null @@ -1,7 +0,0 @@ -# configuration for overlord servers - -[general] -is_overlord = 0 -is_minion = 1 -overlord_server = funcmaster -log_level = DEBUG -- cgit