From f90a544aa81c30de5dfeae5fab52667c6cb4655d Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 12 Aug 2015 09:22:06 +0200 Subject: leap compile for unstable: platform version bump to 0.8, added ivans key --- hiera/aardwolf.yaml | 7 +++++-- hiera/cat.yaml | 9 +++++++-- hiera/donkey.yaml | 15 +++++++++++---- hiera/tuatara.yaml | 7 +++++-- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml index 94b642d..dfa4847 100644 --- a/hiera/aardwolf.yaml +++ b/hiera/aardwolf.yaml @@ -77,8 +77,8 @@ mail: - cat.unstable.bitmask.net name: aardwolf platform: - major_version: "0.7" - version: "0.7.1" + major_version: "0.8" + version: "0.8" service_type: public_service services: - couchdb @@ -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/cat.yaml b/hiera/cat.yaml index e16b373..75b1460 100644 --- a/hiera/cat.yaml +++ b/hiera/cat.yaml @@ -77,8 +77,10 @@ mynetworks: - "85.17.92.143" name: cat platform: - major_version: "0.7" - version: "0.7.1" + major_version: "0.8" + version: "0.8" +rbls: + - zen.spamhaus.org service_type: user_service services: - mx @@ -121,6 +123,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 3ca9395..2a8efe3 100644 --- a/hiera/donkey.yaml +++ b/hiera/donkey.yaml @@ -87,8 +87,7 @@ definition_files: } }, "services": [ - "mx", - "openvpn" + ] } smtp_service: | @@ -616,8 +615,8 @@ nickserver: domain: nicknym.unstable.bitmask.net port: 6425 platform: - major_version: "0.7" - version: "0.7.1" + major_version: "0.8" + version: "0.8" service_type: public_service services: - monitor @@ -661,6 +660,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 @@ -747,6 +749,7 @@ webapp: salt: 478bf7e8ca879a9711b279055f00153e username: webapp customization_dir: /srv/leap/files/webapp/ + default_locale: en default_service_level: 1 domain: unstable.bitmask.net engines: @@ -789,6 +792,10 @@ webapp: - tickets - vmail - www-data + locales: + - el + - en + - es modules: - billing - help diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml index eaf30fb..07c968a 100644 --- a/hiera/tuatara.yaml +++ b/hiera/tuatara.yaml @@ -53,8 +53,8 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.7" - version: "0.7.1" + major_version: "0.8" + version: "0.8" service_type: user_service services: - openvpn @@ -97,6 +97,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 -- cgit v1.2.3