diff options
35 files changed, 125 insertions, 57 deletions
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml index dfa4847..dd51ba8 100644 --- a/hiera/aardwolf.yaml +++ b/hiera/aardwolf.yaml @@ -77,8 +77,8 @@ mail: - cat.unstable.bitmask.net name: aardwolf platform: - major_version: "0.8" - version: "0.8" + major_version: "0.7" + version: "0.7.1" service_type: public_service services: - couchdb diff --git a/hiera/ant.yaml b/hiera/ant.yaml index ef8861d..2783579 100644 --- a/hiera/ant.yaml +++ b/hiera/ant.yaml @@ -129,6 +129,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/armadillo.yaml b/hiera/armadillo.yaml index ae4440d..44c6a56 100644 --- a/hiera/armadillo.yaml +++ b/hiera/armadillo.yaml @@ -126,6 +126,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/cat.yaml b/hiera/cat.yaml index 75b1460..5ae3eae 100644 --- a/hiera/cat.yaml +++ b/hiera/cat.yaml @@ -77,10 +77,8 @@ mynetworks: - "85.17.92.143" name: cat platform: - major_version: "0.8" - version: "0.8" -rbls: - - zen.spamhaus.org + major_version: "0.7" + version: "0.7.1" service_type: user_service services: - mx diff --git a/hiera/clam.yaml b/hiera/clam.yaml index c6b068f..23ca83b 100644 --- a/hiera/clam.yaml +++ b/hiera/clam.yaml @@ -130,6 +130,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/couch1.yaml b/hiera/couch1.yaml index 86b7091..709b2d9 100644 --- a/hiera/couch1.yaml +++ b/hiera/couch1.yaml @@ -130,6 +130,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/couch2.yaml b/hiera/couch2.yaml index 7ae7c37..90777d7 100644 --- a/hiera/couch2.yaml +++ b/hiera/couch2.yaml @@ -130,6 +130,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/deer.yaml b/hiera/deer.yaml index 28eea11..647c4e4 100644 --- a/hiera/deer.yaml +++ b/hiera/deer.yaml @@ -70,6 +70,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml index 9efd8ad..72f9102 100644 --- a/hiera/demodex.yaml +++ b/hiera/demodex.yaml @@ -70,6 +70,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/diplocaulus.yaml b/hiera/diplocaulus.yaml index 005f3a8..3370b51 100644 --- a/hiera/diplocaulus.yaml +++ b/hiera/diplocaulus.yaml @@ -68,6 +68,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml index 2a8efe3..2f17a42 100644 --- a/hiera/donkey.yaml +++ b/hiera/donkey.yaml @@ -63,9 +63,10 @@ definition_files: "domain": "unstable.bitmask.net", "enrollment_policy": "open", "languages": [ - "el", + "de", "en", - "es" + "es", + "pt" ], "name": { "en": "Bitmask" @@ -87,7 +88,8 @@ definition_files: } }, "services": [ - + "mx", + "openvpn" ] } smtp_service: | @@ -615,8 +617,8 @@ nickserver: domain: nicknym.unstable.bitmask.net port: 6425 platform: - major_version: "0.8" - version: "0.8" + major_version: "0.7" + version: "0.7.1" service_type: public_service services: - monitor @@ -749,7 +751,6 @@ webapp: salt: 478bf7e8ca879a9711b279055f00153e username: webapp customization_dir: /srv/leap/files/webapp/ - default_locale: en default_service_level: 1 domain: unstable.bitmask.net engines: @@ -792,10 +793,6 @@ webapp: - tickets - vmail - www-data - locales: - - el - - en - - es modules: - billing - help diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml index 3c39991..9982893 100644 --- a/hiera/elephant.yaml +++ b/hiera/elephant.yaml @@ -27,17 +27,11 @@ definition_files: "user_ips": false }, "host": "snail.dev.bitmask.net", - "ip_address": "176.53.69.19", - "location": "istanbul" + "ip_address": "176.53.69.19" } ], "locations": { - "istanbul": { - "country_code": "TR", - "hemisphere": "N", - "name": "Istanbul", - "timezone": "+2" - } + }, "openvpn_configuration": { "auth": "SHA1", @@ -55,7 +49,7 @@ definition_files: "api_version": "1", "ca_cert_fingerprint": "SHA256: 0f17c033115f6b76ff67871872303ff65034efe7dd1b910062ca323eb4da5c7e", "ca_cert_uri": "https://dev.bitmask.net/ca.crt", - "default_language": "en", + "default_language": "es", "description": { "el": "Bitmask είναι ένα έργο του LEAP με σκοπό τον έλεγχο της απόδοσης και της αξιοπιστίας του λογισμικού LEAP. Bitmask τρέχει για τις τελευταίες αιμορραγία άκρο του κώδικα LEAP, και θα έχει πιθανότατα περισσότερες δυνατότητες και λιγότερα αξιοπιστία από άλλους φορείς παροχής υπηρεσιών.", "en": "Bitmask is a project of LEAP with the purpose to test the performance and reliability of the LEAP software. Bitmask runs on the latest bleeding edge of the LEAP code, and will likely have more features and less reliability than other service providers.", @@ -64,8 +58,6 @@ definition_files: "domain": "dev.bitmask.net", "enrollment_policy": "open", "languages": [ - "el", - "en", "es" ], "name": { @@ -236,6 +228,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/firefly.yaml b/hiera/firefly.yaml index 4b41441..f9b0f0a 100644 --- a/hiera/firefly.yaml +++ b/hiera/firefly.yaml @@ -70,6 +70,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/gorilla.yaml b/hiera/gorilla.yaml index 636c74d..9163a7c 100644 --- a/hiera/gorilla.yaml +++ b/hiera/gorilla.yaml @@ -126,6 +126,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml index 961a96c..1372b72 100644 --- a/hiera/hippo.yaml +++ b/hiera/hippo.yaml @@ -96,6 +96,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/ladybug.yaml b/hiera/ladybug.yaml index 0f86dbc..0a0c341 100644 --- a/hiera/ladybug.yaml +++ b/hiera/ladybug.yaml @@ -68,6 +68,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/leech.yaml b/hiera/leech.yaml index 6ef6273..5e26df0 100644 --- a/hiera/leech.yaml +++ b/hiera/leech.yaml @@ -134,6 +134,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml index 2fe9cf2..b64ce3b 100644 --- a/hiera/millipede.yaml +++ b/hiera/millipede.yaml @@ -98,6 +98,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/mx1.yaml b/hiera/mx1.yaml index 133ad8a..2ceb5e4 100644 --- a/hiera/mx1.yaml +++ b/hiera/mx1.yaml @@ -127,6 +127,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/otter.yaml b/hiera/otter.yaml index 6e14bc9..b3663bb 100644 --- a/hiera/otter.yaml +++ b/hiera/otter.yaml @@ -99,6 +99,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/ovenbird.yaml b/hiera/ovenbird.yaml index 4c3e81d..79d2af2 100644 --- a/hiera/ovenbird.yaml +++ b/hiera/ovenbird.yaml @@ -26,9 +26,10 @@ definition_files: "domain": "cdev.bitmask.net", "enrollment_policy": "open", "languages": [ - "el", + "de", "en", - "es" + "es", + "pt" ], "name": { "en": "Bitmask" diff --git a/hiera/plain1.yaml b/hiera/plain1.yaml index d19b610..2376b1a 100644 --- a/hiera/plain1.yaml +++ b/hiera/plain1.yaml @@ -65,6 +65,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/seahorse.yaml b/hiera/seahorse.yaml index 1d904c0..96ee15f 100644 --- a/hiera/seahorse.yaml +++ b/hiera/seahorse.yaml @@ -96,6 +96,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/snail.yaml b/hiera/snail.yaml index 1356c89..962ca65 100644 --- a/hiera/snail.yaml +++ b/hiera/snail.yaml @@ -16,11 +16,7 @@ enabled: true environment: development hosts: {} ip_address: "176.53.69.14" -location: - country_code: TR - hemisphere: "N" - name: Istanbul - timezone: "+2" +location: ~ mail: smarthost: - starfish.dev.bitmask.net @@ -99,6 +95,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa @@ -129,7 +128,6 @@ stunnel: servers: {} tags: - development - - istanbul tor: bandwidth_rate: 100 x509: diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml index 6cb1cb0..03d1823 100644 --- a/hiera/starfish.yaml +++ b/hiera/starfish.yaml @@ -122,6 +122,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/thrips.yaml b/hiera/thrips.yaml index b94b62d..bf8c6a3 100644 --- a/hiera/thrips.yaml +++ b/hiera/thrips.yaml @@ -138,6 +138,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/tor1.yaml b/hiera/tor1.yaml index 18c30b0..9c6fe23 100644 --- a/hiera/tor1.yaml +++ b/hiera/tor1.yaml @@ -66,6 +66,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml index 07c968a..7002584 100644 --- a/hiera/tuatara.yaml +++ b/hiera/tuatara.yaml @@ -53,8 +53,8 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.8" - version: "0.8" + major_version: "0.7" + version: "0.7.1" service_type: user_service services: - openvpn diff --git a/hiera/vpn1.yaml b/hiera/vpn1.yaml index 787afcf..d64a652 100644 --- a/hiera/vpn1.yaml +++ b/hiera/vpn1.yaml @@ -96,6 +96,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml index b55fb9b..edc79ac 100644 --- a/hiera/wallaby.yaml +++ b/hiera/wallaby.yaml @@ -91,7 +91,10 @@ definition_files: "domain": "demo.bitmask.net", "enrollment_policy": "open", "languages": [ - "en" + "de", + "en", + "es", + "pt" ], "name": { "en": "Bitmask" @@ -272,6 +275,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/hiera/web1.yaml b/hiera/web1.yaml index 247381a..4f4fe79 100644 --- a/hiera/web1.yaml +++ b/hiera/web1.yaml @@ -57,9 +57,10 @@ definition_files: "domain": "bitmask.net", "enrollment_policy": "open", "languages": [ - "el", + "de", "en", - "es" + "es", + "pt" ], "name": { "en": "Bitmask" @@ -324,6 +325,9 @@ ssh: elijah: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== type: ssh-rsa + ivan: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N + type: ssh-rsa jessie: key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== type: ssh-rsa diff --git a/nodes/snail.json b/nodes/snail.json index 98ea6d1..743c777 100644 --- a/nodes/snail.json +++ b/nodes/snail.json @@ -1,13 +1,13 @@ { "services": "openvpn", "ip_address": "176.53.69.14", - "tags": ["development", "istanbul"], + "tags": ["development"], "openvpn": { "gateway_address": "176.53.69.19", "allow_free": false, "filter_dns": true }, - "ssh": { + "ssh": { "port": 4422 } } diff --git a/provider.demo.json b/provider.demo.json index adc42bc..91e7c4c 100644 --- a/provider.demo.json +++ b/provider.demo.json @@ -4,7 +4,8 @@ "es": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.", "el": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted." }, - "languages": ["en"], + "languages": ["en", "pt", "es", "de"], + "default_language": "en", "services": ["openvpn"], "service": { "allow_anonymous": true, diff --git a/provider.development.json b/provider.development.json index f8bef12..48e21a6 100644 --- a/provider.development.json +++ b/provider.development.json @@ -1,16 +1,18 @@ { - "service": { - "allow_anonymous": false - }, - "platform": { - "branch": "develop" - }, - "contacts": { - "default": "micah@leap.se" - }, - "ca": { - "client_certificates": { - "life_span": "2 days" - } + "service": { + "allow_anonymous": false + }, + "platform": { + "branch": "develop" + }, + "contacts": { + "default": "micah@leap.se" + }, + "ca": { + "client_certificates": { + "life_span": "2 days" } + }, + "languages": ["es"], + "default_language": "es" } diff --git a/provider.json b/provider.json index ad97560..a0a5241 100644 --- a/provider.json +++ b/provider.json @@ -11,7 +11,7 @@ "es": "Bitmask es un proyecto de LEAP con el propósito de probar el rendimiento y la fiabilidad del software LEAP. Bitmask corre la última versión del código LEAP, y es de esperar que tenga más funciones y menos fiabilidad que los proveedores de servicios.", "el": "Bitmask είναι ένα έργο του LEAP με σκοπό τον έλεγχο της απόδοσης και της αξιοπιστίας του λογισμικού LEAP. Bitmask τρέχει για τις τελευταίες αιμορραγία άκρο του κώδικα LEAP, και θα έχει πιθανότατα περισσότερες δυνατότητες και λιγότερα αξιοπιστία από άλλους φορείς παροχής υπηρεσιών." }, - "languages": ["en", "es", "el"], + "languages": ["en", "es", "pt", "de"], "default_language": "en", "enrollment_policy": "open", "contacts": { |