From a4f6ca0be19622f9945e7c7e0ebea69d09f63033 Mon Sep 17 00:00:00 2001
From: panda <panda@smemory.org>
Date: Sat, 14 Mar 2020 11:28:22 +0100
Subject: [PATCH] fix variables checking and add instructions for setting
 variables

---
 README.md     | 24 +++++++++++++++++++++++-
 common.yml    |  6 ++++++
 variables.yml |  5 +++--
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1ee4770..c20ec82 100644
--- a/README.md
+++ b/README.md
@@ -10,12 +10,17 @@ add hosts lines to ansible:
 
 SETUP:
 
+you have to change at least 2 variables:
+- users
+- hostname
+
+which by default are set to "CHANGEME" anche the playbook is set to fail if these are set to CHANGEME
+
 insert your user in:
 	variables.yml
 in the list:
 	    users:
 	      goofy
-
 and their ssh keys in the folder
 	keys
 in form of filename:
@@ -23,6 +28,10 @@ in form of filename:
 and format:
 	ssh-rsa [/CUT] user@host
 
+insert your hostname in 
+	variables.yml
+in the variable:
+	hostname:
 
 RUN DEFAULTS:
 
@@ -34,7 +43,20 @@ RUN OPTIONALS:
 - telegraf.yml
 - tincvpn.yml
 - transmission.yml
+- singularity.yml : installs go and builds and installs singularity
 
+VERSIONS:
+docker-compose: 
+variable: compose_ver
+look here: https://github.com/docker/compose/releases/latest
+
+go:
+variable: singularity_go_ver
+look here: https://golang.org/dl/ , the package is like go1.14.linux-amd64.tar.gz and you take the "1.14"
+
+singularity:
+varaible: singularity_ver
+look here: https://github.com/sylabs/singularity/releases/latest
 
 GIT PUSH:
 	git add --all
diff --git a/common.yml b/common.yml
index ce68e56..5a60dae 100644
--- a/common.yml
+++ b/common.yml
@@ -7,6 +7,12 @@
     - variables.yml
 
   tasks:
+    - fail: msg="The user in the list 'users' in variables.yml, has to be set to somethings else than CHANGEME"
+      when: '"CHANGEME" in users'
+
+    - fail: msg="The variable 'hostname' in variables.yml, has to be set to somethings else than CHANGEME"
+      when: '"CHANGEME" in hostname'
+
     - name: change hostname to myserver
       hostname:
         name: "{{ hostname }}"
diff --git a/variables.yml b/variables.yml
index bd9e9a6..5f54711 100644
--- a/variables.yml
+++ b/variables.yml
@@ -1,7 +1,8 @@
 users:
-  - commonuser
+  - CHANGEME
+hostname: CHANGEME
+#
 tinc_vpn: vpn
-hostname: common_hostname
 compose_ver: 1.25.4
 singularity_go_ver: 1.13.6
 singularity_ver: 3.5.2