Changeset 1294

Timestamp:

01/15/07 10:37:00 (6 years ago)

Author:

ckb6

Message:

Changed where the rrdbot certs are kept (now services/rrdbot/certs). Removed extra fields the rrdbot service doubled up on for template generation and added the port to cfengine so any service can use it.

Location:

ccsd/trunk/crcnetd

Files:

• _utils/ccsd_cfengine.py (modified) (1 diff)
• modules/ccs_rrdbot.py (modified) (2 diffs)

ccsd/trunk/crcnetd/_utils/ccsd_cfengine.py

@@ -408 +408 @@
         variables["domain"] = config_get_required("network", "domain")
         variables["site_name"] = config_get_required("network", "site_name")
+        variables["port"] = config_get_required(None, "port")
         variables["server_name"] = config_get_required("network", "server_name")
         ip = getIP(variables["server_name"])

ccsd/trunk/crcnetd/modules/ccs_rrdbot.py

@@ -345 +345 @@
     # Get a list of hosts running the rrdbot service
     rrdbot = getServiceInstance(session_id, ccs_rrdbot.serviceName)
-    hosts = rrdbot.getHostList()
 
     ca = ccs_ca()
 
-    # Loop through each host and ensure that the certs/ directory is populated
-    for host in hosts:
-        try:
-            # Check basic path existance
-            hostdir = "%s/hosts/%s" % (outputDir, host)
-            if not os.path.isdir(hostdir):
-                # Host does not exist in the revision
-                continue
-            rrdbotdir = "%s/rrdbot" % (hostdir)
-            if not os.path.isdir(rrdbotdir):
-                log_warn("Host '%s' does not have rrdbot templates!" % host)
-                continue
-            # Now check for the certs directory and the certificates
-            certsdir = "%s/certs" % (rrdbotdir)
-            ensureDirExists(certsdir)
-            if not os.path.exists("%s/key.pem" % certsdir):
-                key = ca.getFile("ca/rrdbot-key.pem")
-                fp = open("%s/key.pem" % certsdir, "w")
-                fp.write(key)
-                fp.close()
-            if not os.path.exists("%s/cert.pem" % certsdir):
-                cert = ca.getFile("ca/rrdbot-cert.pem")
-                fp = open("%s/cert.pem" % certsdir, "w")
-                fp.write(cert)
-                fp.close()
-        except:
-            log_error("Could not setup rrdbot certificates for %s" % host, \
-                    sys.exc_info())
+    try:
+        certsdir = "%s/services/rrdbot/certs" % (outputDir)
+        ensureDirExists(certsdir)
+        if not os.path.exists("%s/key.pem" % certsdir):
+            key = ca.getFile("ca/rrdbot-key.pem")
+            fp = open("%s/key.pem" % certsdir, "w")
+            fp.write(key)
+            fp.close()
+        if not os.path.exists("%s/cert.pem" % certsdir):
+            cert = ca.getFile("ca/rrdbot-cert.pem")
+            fp = open("%s/cert.pem" % certsdir, "w")
+            fp.write(cert)
+            fp.close()
+    except:
+        log_error("Could not setup rrdbot certificates for %s" % host, \
+                sys.exc_info())
     
 class ccs_rrdbot(ccsd_service):
@@ -412 +399 @@
         variables['classes'] = classes
 
-        # Include a list of hosts that the service is enabled on
-        variables["hosts"] = self.getEnabledHostList()
-        variables["server"] = config_get_required("network", "server_name")
-        variables["port"] = config_get("ccsd", "port", DEFAULT_SERVER_PORT)
         variables["graphport"] = config_get("graphs", "port", "80")
         return variables