From 538e1978f23b015c26d5d842512e10f0dc1ca09e Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 9 Mar 2014 10:51:51 -0300
Subject: Renaming templates

---
 share/config/templates/node/node.example.org.yaml | 8 --------
 share/config/templates/node/node.pp               | 3 ---
 share/config/templates/node/nodo.example.org.yaml | 8 ++++++++
 share/config/templates/node/nodo.pp               | 3 +++
 share/hydra/newnode                               | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 share/config/templates/node/node.example.org.yaml
 delete mode 100644 share/config/templates/node/node.pp
 create mode 100644 share/config/templates/node/nodo.example.org.yaml
 create mode 100644 share/config/templates/node/nodo.pp

(limited to 'share')

diff --git a/share/config/templates/node/node.example.org.yaml b/share/config/templates/node/node.example.org.yaml
deleted file mode 100644
index 56bce89..0000000
--- a/share/config/templates/node/node.example.org.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-nodo::role: 'vserver'
-
-#
-# Backup
-#
-nodo::subsystem::backup::encryptkey: "FIXME"
-nodo::subsystem::backup::password: 'FIXME'
diff --git a/share/config/templates/node/node.pp b/share/config/templates/node/node.pp
deleted file mode 100644
index a5345b3..0000000
--- a/share/config/templates/node/node.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-node 'nodo.example.org' {
-  include nodo
-}
diff --git a/share/config/templates/node/nodo.example.org.yaml b/share/config/templates/node/nodo.example.org.yaml
new file mode 100644
index 0000000..56bce89
--- /dev/null
+++ b/share/config/templates/node/nodo.example.org.yaml
@@ -0,0 +1,8 @@
+---
+nodo::role: 'vserver'
+
+#
+# Backup
+#
+nodo::subsystem::backup::encryptkey: "FIXME"
+nodo::subsystem::backup::password: 'FIXME'
diff --git a/share/config/templates/node/nodo.pp b/share/config/templates/node/nodo.pp
new file mode 100644
index 0000000..a5345b3
--- /dev/null
+++ b/share/config/templates/node/nodo.pp
@@ -0,0 +1,3 @@
+node 'nodo.example.org' {
+  include nodo
+}
diff --git a/share/hydra/newnode b/share/hydra/newnode
index 4011ef2..a0e8dfd 100755
--- a/share/hydra/newnode
+++ b/share/hydra/newnode
@@ -47,10 +47,10 @@ DOMAIN="`cat $HYDRA_FOLDER/config/domain`"
 echo "import \"nodes/$NODE.pp\"" >> $NODES
 
 # Set YAML template
-if [ -e "$HYDRA_FOLDER/config/templates/node/node.example.org.yaml" ]; then
-  YAML="$HYDRA_FOLDER/config/templates/node/node.example.org.yaml"
+if [ -e "$HYDRA_FOLDER/config/templates/node/nodo.example.org.yaml" ]; then
+  YAML="$HYDRA_FOLDER/config/templates/node/nodo.example.org.yaml"
 else
-  YAML="$APP_BASE/share/config/templates/node/node.example.org.yaml"
+  YAML="$APP_BASE/share/config/templates/node/nodo.example.org.yaml"
 fi
 
 # Set node template
-- 
cgit v1.2.3