diff options
-rw-r--r-- | etc/certmaster.conf | 2 | ||||
-rwxr-xr-x | minion/config_data.py | 3 | ||||
-rw-r--r-- | setup.py | 20 |
3 files changed, 4 insertions, 21 deletions
diff --git a/etc/certmaster.conf b/etc/certmaster.conf index cdf1f66..0dd8dcc 100644 --- a/etc/certmaster.conf +++ b/etc/certmaster.conf @@ -1,4 +1,4 @@ -listen_addr = localhost +listen_addr = '' listen_port = 51235 cadir = /etc/pki/func/ca certroot = /var/lib/func/certmaster/certs diff --git a/minion/config_data.py b/minion/config_data.py index 2f34c5c..7007e4d 100755 --- a/minion/config_data.py +++ b/minion/config_data.py @@ -41,8 +41,7 @@ class Config: cp.read([CONFIG_FILE]) - self.ds["is_overlord"] = int(cp.get("general","is_overlord")) - self.ds["is_minion"] = int(cp.get("general","is_minion")) + self.ds["log_level"] = cp.get("general","log_level") self.ds["overlord_server"] = cp.get("general","overlord_server") def get(self): @@ -18,20 +18,8 @@ if __name__ == "__main__": manpath = "share/man/man1/" etcpath = "/etc/%s" % NAME - etcpathdb = "/etc/%s/db" % NAME - wwwpath = "/var/www/%s" % NAME initpath = "/etc/init.d/" logpath = "/var/log/%s/" % NAME - logpathdb = "/var/log/%s/db/" % NAME - settingspath = "/var/lib/%s/" % NAME - migraterepopath = "/var/lib/%s/db/" % NAME - schemapath = "/usr/share/%s/db_schema/" % NAME - upgradepath = schemapath + "upgrade/" - puppetpath = "/usr/share/%s/puppet-config/" % NAME - manifestpath = "/etc/puppet/manifests/" - profiletemplatepath = "/usr/share/%s/profile-template/" % NAME - profilespath = "/var/lib/%s/profiles/" % NAME - queuedprofilespath = "/var/lib/%s/profiles/queued/" % NAME setup( name="%s" % NAME, version = VERSION, @@ -53,12 +41,8 @@ if __name__ == "__main__": ], data_files = [(initpath, ["init-scripts/funcd", "init-scripts/certmaster"]), (etcpath, ["etc/minion.conf","etc/certmaster.conf"]), - (etcpathdb, []), - (logpath, []), - (logpathdb, []), - (migraterepopath, []), - (profilespath, []), - (queuedprofilespath, [])], + (logpath, []) + ], description = SHORT_DESC, long_description = LONG_DESC ) |