diff options
-rw-r--r-- | config/defaults.yaml | 7 | ||||
-rw-r--r-- | config/eip/cougar.leap.se.yaml | 10 | ||||
-rw-r--r-- | config/eip/defaults.yaml | 4 | ||||
-rw-r--r-- | config/hosts/cougar.leap.se.yaml | 8 | ||||
-rw-r--r-- | puppet/hiera.yaml | 2 |
5 files changed, 1 insertions, 30 deletions
diff --git a/config/defaults.yaml b/config/defaults.yaml deleted file mode 100644 index 44fae3d2..00000000 --- a/config/defaults.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -testpw: secret - -# as hashes will get aggregated, this ssh-key would always be present, in addition to others specified in hosts/{fqdn} -ssh_keys: - default_key: - key: ssh-rsa random_noiseAAdABIwAAAGEA3FSyQwBI6Z+nCSjUUk8EEAnnkhXlukKoppND/RRClWz2s5TCzIkd3Ou5+Cyz71X0XmazM3l5WgeErvtIwQMyT1KjNoMhoJMrJnWqQPOt5Q8zWd9qG7PBl9+eiH5qV7NZ diff --git a/config/eip/cougar.leap.se.yaml b/config/eip/cougar.leap.se.yaml deleted file mode 100644 index c051d30b..00000000 --- a/config/eip/cougar.leap.se.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -openvpn_server_configs: - port80_tcp: - port: 80 - proto: tcp-server - port1194_udp: - port: 1194 - proto: udp - -tor: 'true' diff --git a/config/eip/defaults.yaml b/config/eip/defaults.yaml deleted file mode 100644 index 07846fdd..00000000 --- a/config/eip/defaults.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# make shure 'false' is quoted -tor: 'false' - diff --git a/config/hosts/cougar.leap.se.yaml b/config/hosts/cougar.leap.se.yaml deleted file mode 100644 index 758e96a3..00000000 --- a/config/hosts/cougar.leap.se.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -services: - - eip - - couchdb -ssh_keys: - second_key: - key: ssh-rsa more_random_noiseAAdABIwAAAGEA3FSyQwBI6Z+nCSjUUk8EEAnnkhXlukKoppND/RRClWz2s5TCzIkd3Ou5+Cyz71X0XmazM3l5WgeErvtIwQMyT1KjNoMhoJMrJnWqQPOt5Q8zWd9qG7PBl9+eiH5qV7NZ - diff --git a/puppet/hiera.yaml b/puppet/hiera.yaml index a992c057..95283394 100644 --- a/puppet/hiera.yaml +++ b/puppet/hiera.yaml @@ -17,7 +17,7 @@ # relative from where puppet is run, so we need to run puppet # from the root dir of the leap_platform repo :yaml: - :datadir: config + :datadir: ../config :puppet: :datasource: data |