Log Message:
-----------
Allow cluster_name and the like to be set in the conf file.. (I forgot to commit this ~1 week ago and slon has been broken since then...)

Modified Files:
--------------
    slony1-engine/src/slon:
        confoptions.h (r1.6 -> r1.7)

-------------- next part --------------
Index: confoptions.h
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/confoptions.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lsrc/slon/confoptions.h -Lsrc/slon/confoptions.h -u -w -r1.6 -r1.7
--- src/slon/confoptions.h
+++ src/slon/confoptions.h
@@ -9,7 +9,9 @@
 bool set_config_option(const char *name, const char *value);
 
 extern double real_placeholder;
-extern char *string_placeholder;
+
+extern char *rtcfg_cluster_name;
+extern char *rtcfg_conninfo;
 
 extern char *pid_file;
 
@@ -216,13 +218,23 @@
 {
         {
                 {
-                        (const char *)"string_placeholder",                                                           /* conf name */
-                        gettext_noop("place holder"),                                                   /* short desc */
-                        gettext_noop("place holder"),                                                   /* long desc */
+                        (const char *)"cluster_name",                                                           /* conf name */
+                        gettext_noop("Name of the replication cluster"),                                                   /* short desc */
+                        NULL,                                                   /* long desc */
                         SLON_C_STRING                                                                   /* config type */
                 },
-                &string_placeholder,                                                                    /* var_name */
-                "default"                                                                               /* default value */
+                &rtcfg_cluster_name,                                                                    /* var_name */
+                NULL                                                                               /* default value */
+        },
+	{
+		{
+			(const char *)"conn_info",
+			gettext_noop("connection info string"),
+			NULL,
+			SLON_C_STRING
+		},
+		&rtcfg_conninfo,
+		NULL
         },
 	{
 		{