[PATCH] Minor fixes to repair brokenness

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



---
 func.spec     |    3 ++-
 func/utils.py |    8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/func.spec b/func.spec
index af6151c..8fd64f0 100644
--- a/func.spec
+++ b/func.spec
@@ -113,7 +113,8 @@ rm -fr $RPM_BUILD_ROOT
 %{_mandir}/man1/func-inventory.1.gz
 %{_mandir}/man1/funcd.1.gz
 %{_mandir}/man1/func-transmit.1.gz
-
+%{_mandir}/man1/func-build-map.1.gz
+%{_mandir}/man1/func-create-module.1.gz
 
 %post
 # for suse 
diff --git a/func/utils.py b/func/utils.py
index d05acac..e3492e1 100644
--- a/func/utils.py
+++ b/func/utils.py
@@ -16,7 +16,7 @@ import socket
 import string
 
 from certmaster.config import read_config
-from certmaster.commonconfig import CMConfig
+from certmaster.commonconfig import MinionConfig
 from commonconfig import FuncdConfig
 
 
@@ -110,10 +110,10 @@ def get_hostname_by_route():
     # try to find the hostname attached to the ip of the interface that we use
     # to talk to the certmaster
     cm_config_file = '/etc/certmaster/minion.conf'
-    cm_config = read_config(config_file, CMConfig)
+    cm_config = read_config(cm_config_file, MinionConfig)
 
-    server = config.certmaster
-    port = config.certmaster_port
+    server = cm_config.certmaster
+    port = cm_config.certmaster_port
 
     try:
         s = socket.socket()
-- 
1.6.0.6

_______________________________________________
Func-list mailing list
Func-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/func-list

[Index of Archives]     [Fedora Users]     [Linux Networking]     [Fedora Legacy List]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux