Provide sample iwhd-only configure/cleanup.
Comments in default_ yml to explain how things work and warning
README to provide similar overview and warning
---
bin/aeolus-node | 2 +-
conf/README | 14 ++++++++++++++
conf/default_cleanup | 7 +++++++
conf/default_configure | 14 ++++++++++++++
conf/iwhd_cleanup | 13 +++++++++++++
conf/iwhd_configure | 20 ++++++++++++++++++++
contrib/aeolus-configure.spec | 3 +--
7 files changed, 70 insertions(+), 3 deletions(-)
create mode 100644 conf/README
create mode 100644 conf/iwhd_cleanup
create mode 100644 conf/iwhd_configure
diff --git a/bin/aeolus-node b/bin/aeolus-node
index 2339d42..bdbf01d 100644
--- a/bin/aeolus-node
+++ b/bin/aeolus-node
@@ -4,7 +4,7 @@ CAT=/bin/cat
NODE_DIR=/etc/aeolus-configure/nodes
# look for node setting files, or revert to default
-[ -f nodes/$2_$1 ] && NODE=$2_$1 || NODE=default_$1
+[ -f ${NODE_DIR}/${HOSTNAME}_$1 ] && NODE=${HOSTNAME}_$1 || NODE=default_$1
$CAT $NODE_DIR/$NODE
diff --git a/conf/README b/conf/README
new file mode 100644
index 0000000..e4c5a28
--- /dev/null
+++ b/conf/README
@@ -0,0 +1,14 @@
+This directory contains a pair of default_ yml files to describe
+a fully configured aeolus-conductor w/ all of required subcomponents
+on a single box.
+
+Additionally, the iwhd pair of files demonstrates how one could install
+only select components on a particular box (for this to be located correctly
+it should be renamed to <fqdn>_cleanup & <fqdn>_configure respectively.
+Doing so will override the default 'configure everything' description though.
+
+IMPORTANT NOTE: https is on by default, but no other security is in place
+to ensure that components on different machines can interact in a secure
+fashion. This is on the roadmap, but not currently in place. Segregate
+services at your own risk.
+
diff --git a/conf/default_cleanup b/conf/default_cleanup
index 76f212e..df3c502 100644
--- a/conf/default_cleanup
+++ b/conf/default_cleanup
@@ -1,3 +1,10 @@
+#Default cleanup specification
+
+#Set everything up on this box.
+#You can override the default behavior
+#by creating <fqdn>_cleanup with the
+#class membership and parameters as
+#desire and it will take precedence over this.
---
parameters:
enable_https: true
diff --git a/conf/default_configure b/conf/default_configure
index e36eebc..33d155b 100644
--- a/conf/default_configure
+++ b/conf/default_configure
@@ -1,3 +1,17 @@
+#Default setup configuration.
+
+#Set everything up on this box.
+#You can override the default behavior
+#by creating <fqdn>_configure with the
+#class membership and parameters as
+#desire and it will take precedence over this.
+
+#NOTE: Although this suggests the components
+#can be deployed on individual boxes. This will likely
+#become a common practice, but be advised that currently
+#apart from https on the web server for conductor, you should
+#consider intermachine communications insecure. Securing
+#intermachine service calls is on the roadmap.
---
parameters:
enable_https: true
diff --git a/conf/iwhd_cleanup b/conf/iwhd_cleanup
new file mode 100644
index 0000000..d17bd02
--- /dev/null
+++ b/conf/iwhd_cleanup
@@ -0,0 +1,13 @@
+#iwhd-only cleanup specification
+
+#You can override the default behavior
+#by renaming this to <fqdn>_cleanup.
+#This will result in only iwhd being
+#disabled
+---
+parameters:
+ enable_https: true
+ enable_security: false
+classes:
+- aeolus::iwhd::disabled
+
diff --git a/conf/iwhd_configure b/conf/iwhd_configure
new file mode 100644
index 0000000..80acba3
--- /dev/null
+++ b/conf/iwhd_configure
@@ -0,0 +1,20 @@
+#iwhd-only setup configuration.
+
+#renaming this file to <fqdn>_configure will
+#make it override the default configure everything
+#behavior with the behavior below to only set up
+#iwhd
+
+#NOTE: Although this suggests the components
+#can be deployed on individual boxes. This will likely
+#become a common practice, but be advised that currently
+#apart from https on the web server for conductor, you should
+#consider intermachine communications insecure. Securing
+#intermachine service calls is on the roadmap.
+---
+parameters:
+ enable_https: true
+ enable_security: false
+classes:
+- aeolus::iwhd
+
diff --git a/contrib/aeolus-configure.spec b/contrib/aeolus-configure.spec
index f83f039..b3b1089 100644
--- a/contrib/aeolus-configure.spec
+++ b/contrib/aeolus-configure.spec
@@ -50,8 +50,7 @@ rm -rf %{buildroot}
%attr(0755, root, root) %{_sbindir}/aeolus-configure
%attr(0755, root, root) %{_sbindir}/aeolus-cleanup
%attr(0755, root, root) %{_sbindir}/aeolus-node
-%config(noreplace) %{_sysconfdir}/aeolus-configure/nodes/default_configure
-%config(noreplace) %{_sysconfdir}/aeolus-configure/nodes/default_cleanup
+%config(noreplace) %{_sysconfdir}/aeolus-configure/nodes/*
%{dchome}
%changelog
--
1.7.4.4