Merge pull request #3 from keen99/master

basic example set with config tree and sample configs
joewilliams · Sep 7, 2012 · ca38969 · ca38969
2 parents cfaaf31 + 0a9a16d
commit ca38969
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 5 deletions.
diff --git a/README b/README
@@ -6,11 +6,11 @@ Details:
 
 This script accepts a filename (FILE_NAME) as the first arg  and a path (HAPROXY_PATH) as the second. It expects  the haproxy files/directories to be located as follows:
 
-HAPROXY_PATH/conf/global.cfg (file)
+HAPROXY_PATH/conf/global.cfg (file - required)
-HAPROXY_PATH/conf/defaults.cfg (file)
+HAPROXY_PATH/conf/defaults.cfg (file - required)
-HAPROXY_PATH/conf/frontend.cfg (file)
+HAPROXY_PATH/conf/frontend.cfg (file - required)
-HAPROXY_PATH/conf/frontend.d (dir of frontend configs)
+HAPROXY_PATH/conf/frontend.d (dir of frontend configs - optional)
-HAPROXY_PATH/conf/backend.d (dir backend configs)
+HAPROXY_PATH/conf/backend.d (dir backend configs - optional)
 
 The script will concatenate these files together to in the appropriate order to create a single large haproxy configuration at HAPROXY_PATH/FILE_NAME. Also note that under the frontend.d and backend.d the script only picks up files with a ".cfg" extension. It wil also attempt to create a backup of the already joined config file.
 

diff --git a/bin/haproxy_join b/bin/haproxy_join
diff --git a/examples/README b/examples/README
@@ -0,0 +1,7 @@
+
+example directory and file tree layout so you can see (and copy for your
+own use) the supported structure
+
+to create the output file (example/haproxy/conf/haproxy.cfg) run:
+sh build.sh 
+
diff --git a/examples/build.sh b/examples/build.sh
@@ -0,0 +1,6 @@
+basedir=$(dirname $0)
+chmod +x $basedir/../bin/haproxy_join
+$basedir/../bin/haproxy_join haproxy.cfg haproxy
+echo "output file is:"
+ls -l haproxy/haproxy.cfg
+
diff --git a/examples/haproxy/conf/backend.d/2backendd.cfg b/examples/haproxy/conf/backend.d/2backendd.cfg
@@ -0,0 +1 @@
+#2backendd
diff --git a/examples/haproxy/conf/backend.d/backendd.cfg b/examples/haproxy/conf/backend.d/backendd.cfg
@@ -0,0 +1 @@
+#backendd
diff --git a/examples/haproxy/conf/defaults.cfg b/examples/haproxy/conf/defaults.cfg
@@ -0,0 +1 @@
+#defaults
diff --git a/examples/haproxy/conf/frontend.cfg b/examples/haproxy/conf/frontend.cfg
@@ -0,0 +1 @@
+#frontend
diff --git a/examples/haproxy/conf/frontend.d/2frontendd.cfg b/examples/haproxy/conf/frontend.d/2frontendd.cfg
@@ -0,0 +1 @@
+#2frontendd
diff --git a/examples/haproxy/conf/frontend.d/frontendd.cfg b/examples/haproxy/conf/frontend.d/frontendd.cfg
@@ -0,0 +1 @@
+#frontendd
diff --git a/examples/haproxy/conf/global.cfg b/examples/haproxy/conf/global.cfg
@@ -0,0 +1 @@
+#global
diff --git a/examples/haproxy/conf/haproxy.cfg b/examples/haproxy/conf/haproxy.cfg
diff --git a/examples/haproxy/haproxy.cfg b/examples/haproxy/haproxy.cfg
@@ -0,0 +1,7 @@
+#global
+#defaults
+#frontend
+#frontendd
+#2frontendd
+#backendd
+#2backendd