From 33ed5aadaa9080d8c424a9b626cbf7fb9422dedc Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 20 Sep 2012 11:49:24 +0200 Subject: config dir --- config/defaults.yaml | 2 ++ config/hosts/cougar.leap.se.yaml | 4 ++++ config/hosts/rocinante.bitrigger.de.yaml | 5 +++++ config/services/eip.yaml | 5 +++++ 4 files changed, 16 insertions(+) create mode 100644 config/defaults.yaml create mode 100644 config/hosts/cougar.leap.se.yaml create mode 100644 config/hosts/rocinante.bitrigger.de.yaml create mode 100644 config/services/eip.yaml (limited to 'config') diff --git a/config/defaults.yaml b/config/defaults.yaml new file mode 100644 index 00000000..3126c897 --- /dev/null +++ b/config/defaults.yaml @@ -0,0 +1,2 @@ +--- +testpw: secret diff --git a/config/hosts/cougar.leap.se.yaml b/config/hosts/cougar.leap.se.yaml new file mode 100644 index 00000000..ebd58979 --- /dev/null +++ b/config/hosts/cougar.leap.se.yaml @@ -0,0 +1,4 @@ +--- +openvpn_ports: - 999 + - 1000 +tor: true diff --git a/config/hosts/rocinante.bitrigger.de.yaml b/config/hosts/rocinante.bitrigger.de.yaml new file mode 100644 index 00000000..e83c802a --- /dev/null +++ b/config/hosts/rocinante.bitrigger.de.yaml @@ -0,0 +1,5 @@ +--- +# varac's local machine +openvpn_ports: - 1 + - 2 +tor: true diff --git a/config/services/eip.yaml b/config/services/eip.yaml new file mode 100644 index 00000000..d8ac5a4f --- /dev/null +++ b/config/services/eip.yaml @@ -0,0 +1,5 @@ +--- +openvpn_ports: - 80 + - 443 + - 1194 +tor: false -- cgit v1.2.3 From 71e3e3cf022db2c83a52414f9c1cd2e3a985b25d Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 20 Sep 2012 12:12:50 +0200 Subject: no need for local configs here --- config/hosts/rocinante.bitrigger.de.yaml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 config/hosts/rocinante.bitrigger.de.yaml (limited to 'config') diff --git a/config/hosts/rocinante.bitrigger.de.yaml b/config/hosts/rocinante.bitrigger.de.yaml deleted file mode 100644 index e83c802a..00000000 --- a/config/hosts/rocinante.bitrigger.de.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# varac's local machine -openvpn_ports: - 1 - - 2 -tor: true -- cgit v1.2.3 From 5c7ce0a1c90ab1c0844369882f7fcdb6ff05c16d Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 20 Sep 2012 13:39:00 +0200 Subject: new config layout --- config/defaults.yaml | 1 + config/eip/cougar.leap.se.yaml | 5 +++++ config/eip/defaults.yml | 7 +++++++ config/hosts/cougar.leap.se.yaml | 6 +++--- config/services/eip.yaml | 5 ----- 5 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 config/eip/cougar.leap.se.yaml create mode 100644 config/eip/defaults.yml delete mode 100644 config/services/eip.yaml (limited to 'config') diff --git a/config/defaults.yaml b/config/defaults.yaml index 3126c897..17fa03bf 100644 --- a/config/defaults.yaml +++ b/config/defaults.yaml @@ -1,2 +1,3 @@ --- testpw: secret +services: - diff --git a/config/eip/cougar.leap.se.yaml b/config/eip/cougar.leap.se.yaml new file mode 100644 index 00000000..39926616 --- /dev/null +++ b/config/eip/cougar.leap.se.yaml @@ -0,0 +1,5 @@ +--- +openvpn_ports: - 80 + - 443 + - 1194 +tor: 'true' diff --git a/config/eip/defaults.yml b/config/eip/defaults.yml new file mode 100644 index 00000000..7be713b5 --- /dev/null +++ b/config/eip/defaults.yml @@ -0,0 +1,7 @@ +--- + +# make shure 'false' is quoted +tor: 'false' +openvpn_ports: - 80 + - 443 + - 1194 diff --git a/config/hosts/cougar.leap.se.yaml b/config/hosts/cougar.leap.se.yaml index ebd58979..312d0141 100644 --- a/config/hosts/cougar.leap.se.yaml +++ b/config/hosts/cougar.leap.se.yaml @@ -1,4 +1,4 @@ --- -openvpn_ports: - 999 - - 1000 -tor: true +# varac's local machine +services: - eip + - couchdb diff --git a/config/services/eip.yaml b/config/services/eip.yaml deleted file mode 100644 index d8ac5a4f..00000000 --- a/config/services/eip.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -openvpn_ports: - 80 - - 443 - - 1194 -tor: false -- cgit v1.2.3 From 75e57c74d5aa0595e02435ca4de15b9df1cc6002 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 21 Sep 2012 12:45:36 +0200 Subject: parsing of hiera config hash works --- config/eip/cougar.leap.se.yaml | 12 ++++++++---- config/eip/defaults.yml | 5 +---- config/hosts/cougar.leap.se.yaml | 1 - 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'config') diff --git a/config/eip/cougar.leap.se.yaml b/config/eip/cougar.leap.se.yaml index 39926616..d98787d0 100644 --- a/config/eip/cougar.leap.se.yaml +++ b/config/eip/cougar.leap.se.yaml @@ -1,5 +1,9 @@ --- -openvpn_ports: - 80 - - 443 - - 1194 -tor: 'true' +openvpn: + port80_tcp: + port: 80 + protocol: tcp + port1194_udp: + port: 1194 + protocol: udp +tor: 'false' diff --git a/config/eip/defaults.yml b/config/eip/defaults.yml index 7be713b5..fab63a5c 100644 --- a/config/eip/defaults.yml +++ b/config/eip/defaults.yml @@ -1,7 +1,4 @@ --- - # make shure 'false' is quoted tor: 'false' -openvpn_ports: - 80 - - 443 - - 1194 +openvpn: diff --git a/config/hosts/cougar.leap.se.yaml b/config/hosts/cougar.leap.se.yaml index 312d0141..5cf37bb1 100644 --- a/config/hosts/cougar.leap.se.yaml +++ b/config/hosts/cougar.leap.se.yaml @@ -1,4 +1,3 @@ --- -# varac's local machine services: - eip - couchdb -- cgit v1.2.3 From 276de1e249b25e5e00c49229132215681aee6467 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 21 Sep 2012 20:26:20 +0200 Subject: basic configuration for openvpn server files --- config/eip/cougar.leap.se.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/eip/cougar.leap.se.yaml b/config/eip/cougar.leap.se.yaml index d98787d0..fd83d48e 100644 --- a/config/eip/cougar.leap.se.yaml +++ b/config/eip/cougar.leap.se.yaml @@ -1,9 +1,10 @@ --- -openvpn: +openvpn_server_configs: port80_tcp: port: 80 - protocol: tcp + proto: tcp-server port1194_udp: port: 1194 - protocol: udp + proto: udp + tor: 'false' -- cgit v1.2.3 From 413c306cf95f985d84a782f2f7dbbe795cb05c6c Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 23 Sep 2012 16:37:02 +0200 Subject: renamed eip/defaults.yml -> eip/defaults.yaml --- config/eip/defaults.yaml | 4 ++++ config/eip/defaults.yml | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 config/eip/defaults.yaml delete mode 100644 config/eip/defaults.yml (limited to 'config') diff --git a/config/eip/defaults.yaml b/config/eip/defaults.yaml new file mode 100644 index 00000000..250f741c --- /dev/null +++ b/config/eip/defaults.yaml @@ -0,0 +1,4 @@ +--- +# make shure 'false' is quoted +tor: 'false' +openvpn_server_configs: diff --git a/config/eip/defaults.yml b/config/eip/defaults.yml deleted file mode 100644 index fab63a5c..00000000 --- a/config/eip/defaults.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# make shure 'false' is quoted -tor: 'false' -openvpn: -- cgit v1.2.3 From 42b7b1c0568ce7f0f4a38745acc5363a0b676dd2 Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 23 Sep 2012 16:37:31 +0200 Subject: towards ssh-keys --- config/defaults.yaml | 2 +- config/eip/cougar.leap.se.yaml | 2 +- config/eip/defaults.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/defaults.yaml b/config/defaults.yaml index 17fa03bf..489975b2 100644 --- a/config/defaults.yaml +++ b/config/defaults.yaml @@ -1,3 +1,3 @@ --- testpw: secret -services: - +ssh-keys: - diff --git a/config/eip/cougar.leap.se.yaml b/config/eip/cougar.leap.se.yaml index fd83d48e..2bbd71e0 100644 --- a/config/eip/cougar.leap.se.yaml +++ b/config/eip/cougar.leap.se.yaml @@ -7,4 +7,4 @@ openvpn_server_configs: port: 1194 proto: udp -tor: 'false' +#tor: 'false' diff --git a/config/eip/defaults.yaml b/config/eip/defaults.yaml index 250f741c..0938e655 100644 --- a/config/eip/defaults.yaml +++ b/config/eip/defaults.yaml @@ -1,4 +1,4 @@ --- # make shure 'false' is quoted tor: 'false' -openvpn_server_configs: +openvpn_server_configs: - -- cgit v1.2.3 From 8320de2fd5bd8fcb429dfc1b68527a1c39a8341f Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 23 Sep 2012 19:02:28 +0200 Subject: reorderd config, include site_sshd --- config/defaults.yaml | 6 +++++- config/eip/defaults.yaml | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/defaults.yaml b/config/defaults.yaml index 489975b2..62f047e3 100644 --- a/config/defaults.yaml +++ b/config/defaults.yaml @@ -1,3 +1,7 @@ --- testpw: secret -ssh-keys: - +services: - none + +ssh_keys: + test_key: + key: ssh-rsa random_noiseAAdABIwAAAGEA3FSyQwBI6Z+nCSjUUk8EEAnnkhXlukKoppND/RRClWz2s5TCzIkd3Ou5+Cyz71X0XmazM3l5WgeErvtIwQMyT1KjNoMhoJMrJnWqQPOt5Q8zWd9qG7PBl9+eiH5qV7NZ diff --git a/config/eip/defaults.yaml b/config/eip/defaults.yaml index 0938e655..29022408 100644 --- a/config/eip/defaults.yaml +++ b/config/eip/defaults.yaml @@ -2,3 +2,4 @@ # make shure 'false' is quoted tor: 'false' openvpn_server_configs: - + -- cgit v1.2.3