From da564b876b5632d87a2f4aea25661f0504c3eb6c Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 18 Feb 2015 14:42:15 +0100 Subject: moved apt sources and git repo keys to generic sources key --- hiera/ant.yaml | 30 ++++++++-- hiera/armadillo.yaml | 26 +++++++- hiera/canvasback.yaml | 35 ++++++++--- hiera/chameleon.yaml | 35 ++++++++--- hiera/chipmonk.yaml | 30 ++++++++-- hiera/clam.yaml | 160 ++++++++++++++++++++++++++++++++----------------- hiera/couch1.yaml | 30 ++++++++-- hiera/couch2.yaml | 30 ++++++++-- hiera/deer.yaml | 160 ++++++++++++++++++++++++++++++++----------------- hiera/demodex.yaml | 159 ++++++++++++++++++++++++++++++++----------------- hiera/elephant.yaml | 35 ++++++++--- hiera/elk.yaml | 160 ++++++++++++++++++++++++++++++++----------------- hiera/frog.yaml | 30 ++++++++-- hiera/gadwall.yaml | 30 ++++++++-- hiera/gorilla.yaml | 26 +++++++- hiera/hippo.yaml | 30 ++++++++-- hiera/ladybug.yaml | 161 ++++++++++++++++++++++++++++++++------------------ hiera/leech.yaml | 30 ++++++++-- hiera/millipede.yaml | 30 ++++++++-- hiera/monitor1.yaml | 30 ++++++++-- hiera/mx1.yaml | 30 ++++++++-- hiera/octopus.yaml | 30 ++++++++-- hiera/otter.yaml | 30 ++++++++-- hiera/panda.yaml | 30 ++++++++-- hiera/plain1.yaml | 30 ++++++++-- hiera/seahorse.yaml | 30 ++++++++-- hiera/snail.yaml | 158 ++++++++++++++++++++++++++++++++----------------- hiera/starfish.yaml | 159 ++++++++++++++++++++++++++++++++----------------- hiera/thrips.yaml | 30 ++++++++-- hiera/tor1.yaml | 30 ++++++++-- hiera/urchin.yaml | 161 ++++++++++++++++++++++++++++++++------------------ hiera/vpn1.yaml | 30 ++++++++-- hiera/wallaby.yaml | 35 ++++++++--- hiera/web1.yaml | 35 ++++++++--- 34 files changed, 1492 insertions(+), 583 deletions(-) (limited to 'hiera') diff --git a/hiera/ant.yaml b/hiera/ant.yaml index 6adac68..5a247fe 100644 --- a/hiera/ant.yaml +++ b/hiera/ant.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - elijah@leap.se - sysdev@leap.se @@ -95,6 +90,31 @@ platform: service_type: internal_service services: - couchdb +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/armadillo.yaml b/hiera/armadillo.yaml index cabd125..38863a0 100644 --- a/hiera/armadillo.yaml +++ b/hiera/armadillo.yaml @@ -3,7 +3,6 @@ apt: url: backports: "http://ftp.daum.net/debian/" basic: "http://ftp.daum.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se - varac@leap.se @@ -89,6 +88,31 @@ platform: service_type: internal_service services: - couchdb +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/canvasback.yaml b/hiera/canvasback.yaml index 7b46e0f..2038754 100644 --- a/hiera/canvasback.yaml +++ b/hiera/canvasback.yaml @@ -2,11 +2,6 @@ api: domain: api.cdev.bitmask.net port: 4430 -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - drebs@leap.se - sysdev@leap.se @@ -163,6 +158,31 @@ platform: service_type: public_service services: - webapp +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -228,7 +248,7 @@ webapp: client_certificates: bit_size: 2048 digest: SHA256 - life_span: 2m + life_span: "2 months" limited_prefix: LIMITED unlimited_prefix: UNLIMITED client_version: @@ -254,9 +274,6 @@ webapp: - postmaster - ssladmin - www-data - git: - revision: origin/version/0.6 - source: "https://leap.se/git/leap_web" modules: - billing - help diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml index 68e2935..901dff9 100644 --- a/hiera/chameleon.yaml +++ b/hiera/chameleon.yaml @@ -2,11 +2,6 @@ api: domain: api.unstable.bitmask.net port: 4430 -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se - varac@leap.se @@ -630,6 +625,31 @@ service_type: public_service services: - monitor - webapp +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -712,7 +732,7 @@ webapp: client_certificates: bit_size: 2048 digest: SHA256 - life_span: 2m + life_span: "2 months" limited_prefix: LIMITED unlimited_prefix: UNLIMITED client_version: @@ -738,9 +758,6 @@ webapp: - postmaster - ssladmin - www-data - git: - revision: origin/version/0.6 - source: "https://leap.se/git/leap_web" modules: - billing - help diff --git a/hiera/chipmonk.yaml b/hiera/chipmonk.yaml index dfe0af6..9db921f 100644 --- a/hiera/chipmonk.yaml +++ b/hiera/chipmonk.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - drebs@leap.se - sysdev@leap.se @@ -97,6 +92,31 @@ platform: service_type: user_service services: - mx +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/clam.yaml b/hiera/clam.yaml index fa16470..21277e5 100644 --- a/hiera/clam.yaml +++ b/hiera/clam.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - micah@leap.se - sysdev@leap.se @@ -110,6 +105,31 @@ soledad: username: soledad port: 2323 require_couchdb: true +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -219,62 +239,92 @@ x509: -----END CERTIFICATE----- cert: | -----BEGIN CERTIFICATE----- - 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 + j7prdnYw9Ykg7IeZi4Q= -----END CERTIFICATE----- commercial_ca_cert: ~ commercial_cert: ~ commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- use: true use_commercial: false diff --git a/hiera/couch1.yaml b/hiera/couch1.yaml index 5318d9e..eb42acd 100644 --- a/hiera/couch1.yaml +++ b/hiera/couch1.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se couch: @@ -95,6 +90,31 @@ soledad: username: soledad port: 2323 require_couchdb: true +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/couch2.yaml b/hiera/couch2.yaml index c5e057a..d2e5d95 100644 --- a/hiera/couch2.yaml +++ b/hiera/couch2.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se couch: @@ -95,6 +90,31 @@ soledad: username: soledad port: 2323 require_couchdb: true +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/deer.yaml b/hiera/deer.yaml index aeb83f5..1645d86 100644 --- a/hiera/deer.yaml +++ b/hiera/deer.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - micah@leap.se - sysdev@leap.se @@ -36,6 +31,31 @@ platform: service_type: internal_service services: - tor +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -128,62 +148,92 @@ x509: -----END CERTIFICATE----- cert: | -----BEGIN CERTIFICATE----- - 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 + f2L6JFTn3YW6AryUOg== -----END CERTIFICATE----- commercial_ca_cert: ~ commercial_cert: ~ commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- use: true use_commercial: false diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml index c0ad5f3..72bf4d1 100644 --- a/hiera/demodex.yaml +++ b/hiera/demodex.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - micah@leap.se - sysdev@leap.se @@ -36,6 +31,31 @@ platform: service_type: internal_service services: - backup +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -115,63 +135,92 @@ x509: -----END CERTIFICATE----- cert: | -----BEGIN CERTIFICATE----- - MIIEsjCCApqgAwIBAgIQK/gkvA0auLUM6znqg6ej5jANBgkqhkiG9w0BAQsFADBK + MIIFsjCCA5qgAwIBAgIQD+GCX6HVlSu8wDqVbLLQcTANBgkqhkiG9w0BAQsFADBK MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa - BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQwNDA4MDAwMDAwWhcNMTUw - NDA4MDAwMDAwWjAiMSAwHgYDVQQDDBdkZW1vZGV4LmRldi5iaXRtYXNrLm5ldDCC - ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMUlrtB/NQO3a1OU7ln5AafH - 2r+jS91Af6Ekmuz3ozoGHmRQ76sTPVYHpOCvehFEtJ4mrbEnp6OOgI6NQ6WJXKc3 - up/ZiPsu/ZlETdTBLhr62ln+6BFFU3itbFiy6ebAA737GX+V9CD9b4PscMH9qcNu - 2Am7offXxIQKQ/JZM5ZAMgMcJfAMDO761wBHhelwxViqqG3In5xnA1pc/keNsg84 - mlAX+1TNW9ZbHwnhu6eEeY+fLtbOTQX43zQ2RPkxx8+elr6zHFSV4dL0cFqPE/w8 - PoHZCHmaMtR+cvGNImqoMZwIiblnZJjbo2qBfiDtGGviKqXQDCicL//uXf2HcC8C - AwEAAaOBuzCBuDAdBgNVHQ4EFgQUWYjRR60uAJuXzOGphHU/x+yEEtkwPwYDVR0R - BDgwNoIVZGVtb2RleC5kZXYuYml0bWFzay5pghdkZW1vZGV4LmRldi5iaXRtYXNr - Lm5ldIcEzA2kqzALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG - AQUFBwMCMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+ - D48wDQYJKoZIhvcNAQELBQADggIBAF/TV5i43KM0WUhaMx+1QLCFsOuzOjj7o/Ud - NXfWgapmXXvCQWfQ4zIKfOMLrSlTjqbxwHu1v1qkEZTaChuzQupcx3vv+x9e2NuZ - lnxQhc2HsTxP1+U9lfX43gmL6LbTXo/Kq7BczIJsiu5qBmWS4E0WkTZW1TajkB0A - NYxg4py1bhYhNdKbvfC6QoUBuI8Wv/9z5ZCwedEDcORXlQWNvRzbSGLeU+duui4B - BsmU8gVwyD1gzXS7IHdAfuNDq3hh8VSJHTGZJykTlI/EN7Lx2/UlgpwiUShQZxKj - l7AYSYaktKdlZneIEZ1zkqa6hL6g8k0uqrDkduitqPH0xyTeO39wSDOX/tZ4Y4iI - hnx+qzm8syZADSYDiAYhOietFkmM9vYblQPNYaCoeoj4PtZgxolc4p0LBp3YJXVG - flzXvbjSHMuMEKIBhGP2Gr0TukPHSZpThrn5alebIiyfsXWgTwZgLCHCNmDx4S+4 - 8IcEkNFESymCDOfQdgD7UUPgNAaeSDJfoBoU30cRmM/OPIK2N8uq4LA4YRFeiutE - I0diZHGA/e/LA402aroo80gj2vwpI0iosyGr3fjKoQVvcTvSJCz4DUZH8Wsw7I68 - OpW3YVHUtq5gAPHXSXXxgfbwhOJPrNz5h8cEwfdKuf0FjDmqPVo+esSLzNmk/Yqu - duiea0DC + BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTUwMjEwMDAwMDAwWhcNMTYw + MjEwMDAwMDAwWjAiMSAwHgYDVQQDDBdkZW1vZGV4LmRldi5iaXRtYXNrLm5ldDCC + AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDjJoiiHDdlgcJ28cRrAABg + gEiRO2nvtpJU9TGpMKYtLh+WBtaeLl+EeGoZCXzKrEb7FBai5Ruf+Da3RyaTr6J6 + Jv2+6h+sJ5f8uGJPfii6JJAhUqg1YwlgrZa9afspaBk0+EpkHvCmCGrHe1DeSImG + x93hmbY7Sq+wuF/GqYlTJPTuVB25Bv6wZx0CDiV/ihD/Z85XD4NbJBXvoUdlZClc + 9gra52UDiZprV1+HireoHWjx3t1kMfrUgwMQTQOJ2efVxdMGwz6DkfyeE/LUPrv2 + HpEgcKXDpisH7N2MNe7xg0BbKneiDHQKqylrdMed1QMyq+XG/NcDB9anx2Ju9reD + KfaR8oVY3j7rVUhrEM+izFuwUbzmtBhvTFy6r9Z75aOgm7EuW6ykIHFPYEpGVlKf + c7IxwqYJEXKgyCE+h5rmyOpWzZpBsxUuAaPKspd+dWxdkF3cD/4narsFaXukYW0W + ybyE3gTdefbULlDC+Iz51NE5lciWtGyP17gJJnSpDczL7lvNQtVFks11uWC2PjxE + GXS1GdUTFO+Z7HM+chLDXPSm7FF9bKp2pZ/jXYsvxGkI/gjgrmplYvGNGJHmSq7/ + RFRqywlAWEwupoft2yMoz4FoZgqidnIN50Aqvanj1HsO3rfu0/Kn0YlKNN9yUh/K + kCMjQsK3dRlGvmTEepsZAgMBAAGjgbswgbgwHQYDVR0OBBYEFE/9/dZPUm203vaj + mMNy7cTfQqWvMD8GA1UdEQQ4MDaCFWRlbW9kZXguZGV2LmJpdG1hc2suaYIXZGVt + b2RleC5kZXYuYml0bWFzay5uZXSHBMwNpKswCwYDVR0PBAQDAgWgMB0GA1UdJQQW + MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmB + gyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQBMMDH2KtcALIda + IANza4raapvjozdGhPlrWUNOOXwA9mSN9gFKA2n0PIiQD5siI2lWIem/64PP9O2G + h5Wk0d6bSZEGh4kQKSjBFtmYV3WShTuBmSIYYOghyoU8ZlEzE8mBlISNoFmlANoz + tn7UgvftbltjQmhGNLGOVsPR2V/rBwW9uGV1qxBGIEwqkBZVHjNZOa/mx/F8/Kk1 + VLxkh4fjeBHDkKPShzAzzKYG1LVVLVlYOYAyJq2ViX5AFS2phHh/rPPCsdvzcq0X + F1bdW2q5eBUyAD0pvOA4aBXmF2HAyPHspK1S/CcbxtF9rmLkROTWlrV+JSITEjS2 + azgfHsIaXRYStwT+9B/RWOXODH7Uqw6sw9D+grHHwFZx+736lrXooszvEyk4nBf5 + AHaSW8oLz2+Pf2JLhAWgph673pdtk9kMEPjbZ5QMD3PKRuSvrb+cocGNqsB+E43f + sirjbAVZ2FzkeaKJlxFdf3549637TqokhrgALteiISiHDIp3rXXKkKddF/Zh5ne7 + 44ramK0aQoBdmtItjsxfmIxfsu07SkHz55XTmtKejfmEiJEG4qTHTc3U9uyRgHks + 3i3WCbxioi3MLuW4IGUbCAZE9KlSoVfvXVO8ixq8L+jnX8NH2/bY/2vUpVlvxVYy + Tli57IhjzvUSAaN36Zq+iA4Pt6mm2w== -----END CERTIFICATE----- commercial_ca_cert: ~ commercial_cert: ~ commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- use: true use_commercial: false diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml index 348b8a2..f58bb4b 100644 --- a/hiera/elephant.yaml +++ b/hiera/elephant.yaml @@ -2,11 +2,6 @@ api: domain: api.dev.bitmask.net port: 4430 -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - micah@leap.se - sysdev@leap.se @@ -232,6 +227,31 @@ platform: service_type: public_service services: - webapp +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -314,7 +334,7 @@ webapp: client_certificates: bit_size: 2048 digest: SHA256 - life_span: 2m + life_span: "2 days" limited_prefix: LIMITED unlimited_prefix: UNLIMITED client_version: @@ -340,9 +360,6 @@ webapp: - postmaster - ssladmin - www-data - git: - revision: origin/version/0.6 - source: "https://leap.se/git/leap_web" modules: - billing - help diff --git a/hiera/elk.yaml b/hiera/elk.yaml index 778183a..d249406 100644 --- a/hiera/elk.yaml +++ b/hiera/elk.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - micah@leap.se - sysdev@leap.se @@ -102,6 +97,31 @@ platform: service_type: internal_service services: - couchdb +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -211,62 +231,92 @@ x509: -----END CERTIFICATE----- cert: | -----BEGIN CERTIFICATE----- - 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 + PO+cnwXHBGM+bZk= -----END CERTIFICATE----- commercial_ca_cert: ~ commercial_cert: ~ commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- use: true use_commercial: false diff --git a/hiera/frog.yaml b/hiera/frog.yaml index 4e10ca9..812d32c 100644 --- a/hiera/frog.yaml +++ b/hiera/frog.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se development: @@ -30,6 +25,31 @@ platform: service_type: public_service services: - static +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/gadwall.yaml b/hiera/gadwall.yaml index 48cdd8b..c09560c 100644 --- a/hiera/gadwall.yaml +++ b/hiera/gadwall.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - drebs@leap.se - sysdev@leap.se @@ -96,6 +91,31 @@ soledad: username: soledad port: 2323 require_couchdb: true +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/gorilla.yaml b/hiera/gorilla.yaml index 7c67ee4..6d8478f 100644 --- a/hiera/gorilla.yaml +++ b/hiera/gorilla.yaml @@ -3,7 +3,6 @@ apt: url: backports: "http://ftp.daum.net/debian/" basic: "http://ftp.daum.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se - varac@leap.se @@ -89,6 +88,31 @@ platform: service_type: internal_service services: - couchdb +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml index 3b3d39c..1eb6225 100644 --- a/hiera/hippo.yaml +++ b/hiera/hippo.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se development: @@ -62,6 +57,31 @@ platform: service_type: user_service services: - openvpn +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/ladybug.yaml b/hiera/ladybug.yaml index 70b35c4..20649f9 100644 --- a/hiera/ladybug.yaml +++ b/hiera/ladybug.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - micah@leap.se - sysdev@leap.se @@ -36,6 +31,31 @@ platform: service_type: internal_service services: - backup +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -114,63 +134,92 @@ x509: -----END CERTIFICATE----- cert: | -----BEGIN CERTIFICATE----- - MIIEsjCCApqgAwIBAgIQXxRcwbUoQ5DTbkpRSrnA0zANBgkqhkiG9w0BAQsFADBK - MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa - BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQwNDA4MDAwMDAwWhcNMTUw - NDA4MDAwMDAwWjAiMSAwHgYDVQQDDBdsYWR5YnVnLmRldi5iaXRtYXNrLm5ldDCC - ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALg0wT0v1r5D7vzF2Taxr98l - GDH3ADuz9UDUmqA1+b8KdI2GliCmYCuxzHMVNkZvvi9HMlS/joC6P1JNA8ivY1Uu - BWaf1CTUjdA2XHxO3P9/ThTxehCIrTMyc/be8yrh4ND17Bn6oCmctLV3bwB8peQu - Pdj1KEwtEyrMdK74Ob01xrCDWxRolzrdjwJhmi1JoikY4u9pl8TDWg9ax6MA892R - 4pDgVXLoOQvs0YSURuO6r7/isrMKzeuGZYVRmTuIUIw22wwQlE1sraHwA4BPILw5 - 2Qyy8WNa5wyeCvmkDUKF/B0q+cpxdtS4cZ5TIhKb42m8XMCzTZ1SCV0rCWNBP70C - AwEAAaOBuzCBuDAdBgNVHQ4EFgQUio05i8R96aSOJyIOSM8z0us+L7IwPwYDVR0R - BDgwNoIVbGFkeWJ1Zy5kZXYuYml0bWFzay5pghdsYWR5YnVnLmRldi5iaXRtYXNr - Lm5ldIcEx3dwCDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG - AQUFBwMCMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+ - D48wDQYJKoZIhvcNAQELBQADggIBADeojAFQiMqFgFIA1a1jKgAMEtYOmNfqjfDV - L2dfCaSYOAcBFltwu87pO8pXbCQgborhGvB3hS7/4tmI6ibTZEscxOQnREWKyyua - MFHn8JW6oW10xh/6dG/Eo0PC31WTaXA3+MR0/EgiQWxRt5inZ4x7V+d/pOj01qpO - 3tpsnQFlu0kcOaj8wUYhSioyVLUxk2hZWLCNTrzmGK3o6+9E6/5+sgZ99c8XKMlm - 7n0+2CC9BPZoKKSY64PuuchTlKdbf5EzFV8LozOaMu9x583bTaXiu8CvSMYknPV6 - A/uvuPrgZh8B9IYoQE25grJOonfWaj97AvDhizKCO0vCwnef6DyravCkrX/5L+Fc - 6WlZ3z0HXH9d0BjvBwD8aYjxUiyoRfQCDeNfJgQ4ZDjKJ4+8dwjxA8QlLwFL6xrV - s/PHB7Za+emzBtuh55MDIgfkbofW0mUKCQqOHB0dAMyL9uYshlIgaazuntwmjQ2q - SDEUrv0Nccj8vaAgmkhmmgOXeKJfsEtc5huBmIUGDrhpIdO9E0eXOp4xZkaZbPi7 - L/IBfnhqjRPumli/y1Fdo8VLLzfOm9ot5deLD+LnOM59T9P2f3wY5akzcDvt35M5 - 2N0VqoLqitPE/iBC/2Huwtf8fjEy61PFpGTne4vYmuwyzn5B57vOtxZFxnXObvXc - vq8Eyi/G + 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 + CqJz60H5WKW3ETRjsmgetMitfBNho5s= -----END CERTIFICATE----- commercial_ca_cert: ~ commercial_cert: ~ commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- use: true use_commercial: false diff --git a/hiera/leech.yaml b/hiera/leech.yaml index 78f063f..a1b3637 100644 --- a/hiera/leech.yaml +++ b/hiera/leech.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - elijah@leap.se - sysdev@leap.se @@ -109,6 +104,31 @@ platform: service_type: user_service services: - mx +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml index 989d162..61911cb 100644 --- a/hiera/millipede.yaml +++ b/hiera/millipede.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - elijah@leap.se - sysdev@leap.se @@ -64,6 +59,31 @@ platform: service_type: user_service services: - openvpn +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/monitor1.yaml b/hiera/monitor1.yaml index c615302..efba894 100644 --- a/hiera/monitor1.yaml +++ b/hiera/monitor1.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se development: @@ -154,6 +149,31 @@ platform: service_type: internal_service services: - monitor +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/mx1.yaml b/hiera/mx1.yaml index b5c6e0d..2bc8949 100644 --- a/hiera/mx1.yaml +++ b/hiera/mx1.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se couchdb_leap_mx_user: @@ -101,6 +96,31 @@ platform: service_type: user_service services: - mx +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/octopus.yaml b/hiera/octopus.yaml index 6618a2f..014fb4a 100644 --- a/hiera/octopus.yaml +++ b/hiera/octopus.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se - varac@leap.se @@ -97,6 +92,31 @@ platform: service_type: user_service services: - mx +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/otter.yaml b/hiera/otter.yaml index b810fe3..5cd6863 100644 --- a/hiera/otter.yaml +++ b/hiera/otter.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - elijah@leap.se - sysdev@leap.se @@ -65,6 +60,31 @@ service_type: user_service services: - openvpn - tor +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/panda.yaml b/hiera/panda.yaml index e2553f1..2d6ad27 100644 --- a/hiera/panda.yaml +++ b/hiera/panda.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se - varac@leap.se @@ -96,6 +91,31 @@ soledad: username: soledad port: 2323 require_couchdb: true +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/plain1.yaml b/hiera/plain1.yaml index 0dcdf09..a56bd2c 100644 --- a/hiera/plain1.yaml +++ b/hiera/plain1.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se development: @@ -30,6 +25,31 @@ platform: version: "0.6.1" service_type: internal_service services: [] +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/seahorse.yaml b/hiera/seahorse.yaml index 1edae9f..7fbceb3 100644 --- a/hiera/seahorse.yaml +++ b/hiera/seahorse.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se - varac@leap.se @@ -64,6 +59,31 @@ platform: service_type: user_service services: - openvpn +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/snail.yaml b/hiera/snail.yaml index 9540bfb..b59cb6d 100644 --- a/hiera/snail.yaml +++ b/hiera/snail.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - micah@leap.se - sysdev@leap.se @@ -65,6 +60,31 @@ platform: service_type: user_service services: - openvpn +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -145,31 +165,37 @@ x509: -----END CERTIFICATE----- cert: | -----BEGIN CERTIFICATE----- - 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 + H12x0G0Zudi0jG44mezZQA== -----END CERTIFICATE----- client_ca_cert: | -----BEGIN CERTIFICATE----- @@ -222,31 +248,55 @@ x509: -----END DH PARAMETERS----- key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- use: true use_commercial: false diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml index e06514c..f07f183 100644 --- a/hiera/starfish.yaml +++ b/hiera/starfish.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - micah@leap.se - sysdev@leap.se @@ -121,6 +116,31 @@ platform: service_type: user_service services: - mx +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -215,32 +235,37 @@ x509: -----END CERTIFICATE----- cert: | -----BEGIN CERTIFICATE----- - MIIEtjCCAp6gAwIBAgIRALgK7f+BsxPXrCFxvdehkXcwDQYJKoZIhvcNAQELBQAw + MIIFtjCCA56gAwIBAgIRAMf3cb+14uzJZhJZ2w1lD+EwDQYJKoZIhvcNAQELBQAw SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww - GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE0MDQwODAwMDAwMFoXDTE1 - MDQwODAwMDAwMFowIzEhMB8GA1UEAwwYc3RhcmZpc2guZGV2LmJpdG1hc2submV0 - MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6GA/cZ6E1DQ/3ANuKX4j - XpShBbkklhw0KwEjyZunX0EMP5YlDikd/GbksDBdiO6oD4ACbMbFGnR9tF4+Qf3e - pmAYHm3xRzg0KlXeoIqn7svRgOijGf6mGfmKFBfD28zdUHeNKF+WUS3U6fj5Hsro - JhMl6guWbgb0KUK9MFQNQG0wkaX8HgndjgdZWeOMbAok9O7NdgDwYrBE/K6fRhjY - 87Fx3xTQadQxof+ENM6wTOlcl+/v7hq1HT+ue+Zqu2opRrhlNfqmVXVsXTd27QV2 - camW9RToqd8isp+7ydAypmTASvWFjDDNab1MPW/ptVv//VFbGMr+jqOj+L0yfPBd - nwIDAQABo4G9MIG6MB0GA1UdDgQWBBSifaZjQn5YmfCClBoAittEvEpMxjBBBgNV - HREEOjA4ghZzdGFyZmlzaC5kZXYuYml0bWFzay5pghhzdGFyZmlzaC5kZXYuYml0 - bWFzay5uZXSHBLA1RRcwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB - BggrBgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66 - LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQBSqOPNb+7GGhCRN+sMBgDXqCJMsyoD - v7sCKSybNDZnHXY849TQSDxDwf20Jp8AhJjbbiqgqZWEak7TW/spZnbHpqweTPiP - 455YpfZVthUoXPfd1oUu0oLPF6mpJsceyPLSi+vt8xW5+yjDbJoo4dPZxC0YIKE8 - IWK+zgAWIABjpenhlTxfWV0oJq8ZzwsYvjqQtloUrKuLTigp9NJtIcn07H33rBUU - Nx5+NOf69UixBQGeOZ7+mZISFierr8hc1iYEWBQdhWaK6zOq43eBZdzT1Hzx+J9W - cbFLXIx3SqF2K8nFwr2eEz5DYBzjq5PNdk0LMry8Q7oJlscyW1i1zA97uCkjmJ8L - xv/fVSfR9wIBqZeLYPr3/QeYSVNWpD/IEwvL4vdAKcjCJYX7aVPRvk2QPfWZN5ox - qKm6Iuq3b/UhbbbqAKQeOMOPql4DkxCDdWV2+mCP+ydkmaWQGc4iEc1ZqpIC7hgK - SVH8O+Zop6yMDoWINRvSDr/FcYoJS3Fc4hu0G/YHS60YfodMCp57kM0YB8Q8ZjX/ - H+Uq2U6bTffkpguPdeqYWhOcWIFx9CUXv9G7IyDD+4rpaB3HqObtcqTbWrrQ/dA5 - BP7A48DSBUlcz4PBctQdQjs5rzqchf+sP2jvJ6423Q9Sc7VOK8DDosS+riuOCZIs - cC3ugdiVDOggqw== + GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE1MDIxMDAwMDAwMFoXDTE2 + MDIxMDAwMDAwMFowIzEhMB8GA1UEAwwYc3RhcmZpc2guZGV2LmJpdG1hc2submV0 + MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyKmIxliIui0xkyeBYuVj + hdw0sn68Ebtre2rHe80bbalsuDty8uNvz8EZRdyxK8GFah+2vYTeG26kVVDbyXuZ + lPly+8V/AaRm7ns4riOO4jq9lM32ZCRwhZ2T5USswNPlFCe2YPuMwPWGTXRe8H+b + XYIyGPUYcsvxFyxhp4nZTnaMj9WDu96q434ZN2mJP4y4ULnM9spYlTIc4SK8hKF0 + QCZM0usM42kP5urzQ09GNb1EhBedyueBQnuJyAA3rvXpVmud1usIj0v5SuJfos2O + 55uqry3TkPHZd90Z/UU8/R+npZldU+XDvE1A60Sdp00HCfw7DPtfEzat7WDHVO5F + 4VbkwPcjNoR+VW13nZmqUGJgH2Yb81pLzVzlUky6lPE+jEWtLzkYzhR4NnElWExh + yrr5TmpY8DkzgGsrTuy0usxxwCWTwz078LvgZah5adc/bo4gB3df+7+rb2mAoGav + dTlUT/QlVtAA41oDu6jNqWIsmksY0PiyEcx70Cd/inInhyG3D8WM/NxlT3gQNY5q + SjTmMhzCFXkjEDd+7S72WD1O4He4MHhmOrm4dSaUvyAmHVnXLuY3UI6vEQ7cjoeI + k8i37oXFfha2YCD0N+47bHwKmvWTy+R3rMTkGv2ARvmHojf5igSJzwVM0MfQSnhY + tw1WKJqTU7wIol4ue8AVhu0CAwEAAaOBvTCBujAdBgNVHQ4EFgQU7KbV6UcJX6lL + sEg3ZBMHxrf1QRwwQQYDVR0RBDowOIIWc3RhcmZpc2guZGV2LmJpdG1hc2suaYIY + c3RhcmZpc2guZGV2LmJpdG1hc2submV0hwSwNUUXMAsGA1UdDwQEAwIFoDAdBgNV + HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAW + gBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEAsIBl48L3 + gdvXvfxQ+wJwg+KUgvrtRyE0G1yRdLd1X7CHML+mZziQLPy3abopw98//B0rbFED + DxxF55bM+YdEn71J4rZ2bqxf7+tG+5VfBJICIxrvKw1IqjBIi7fvNvCqD6AbL5z+ + LbTPscLQjVxOB7w7e+Gq1KOlCBfJ9S4gFpMs8vBam/gAKOClhCRsD/QPKsQ5Qu4H + 4VOOJNJlBV5p25IDIsKtJj6vAdQDbgmFBhmHUT+lmLLKb5pesM1n5I5bk6BX4o2s + 9sitaouumz2910ynIcKi8/sdk9mywiei/d6QKGjIf1rp5O4E+1+BCVSmXOfTk9bI + 55R+69yDOAVNtdFnGBSJz47RNdufYdkwJgRdinB0dlQT1pL/7rVUqDT047zKBwql + +FCXVA6Jhvx2fp+LiCy/Ed8fzEPlo9WkcYIYA3ERJLnZm2opf3RzUjpVRu82yn45 + POm5nLw09JoOJSZbYkTydkAbZKzWE95/bzH94dfKS3K2PGCOWat3sZO4IeSpy9bh + GvE5g/UnjmaJbzHzp6gMq7IxzABOf3JXHciU0dGnyp6Rn197TFXWjRzwXS87YvBf + VPVdenSlrZKE6xo0vIjVdCAlmxULhksC9GOm5HnNhX3WufsVgHl8fx9oZuEBg5zl + 75WfbcEq1feMrJZ83BXYhkWTTYaynjG7zqY= -----END CERTIFICATE----- client_ca_cert: | -----BEGIN CERTIFICATE----- @@ -453,31 +478,55 @@ x509: -----END RSA PRIVATE KEY----- key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- use: true use_commercial: true diff --git a/hiera/thrips.yaml b/hiera/thrips.yaml index b6596c1..89138fc 100644 --- a/hiera/thrips.yaml +++ b/hiera/thrips.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - elijah@leap.se - sysdev@leap.se @@ -104,6 +99,31 @@ soledad: username: soledad port: 2323 require_couchdb: true +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: diff --git a/hiera/tor1.yaml b/hiera/tor1.yaml index 8451dec..bd83888 100644 --- a/hiera/tor1.yaml +++ b/hiera/tor1.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se development: @@ -31,6 +26,31 @@ platform: service_type: internal_service services: - tor +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/urchin.yaml b/hiera/urchin.yaml index cf845c7..ef6f500 100644 --- a/hiera/urchin.yaml +++ b/hiera/urchin.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - micah@leap.se - sysdev@leap.se @@ -111,6 +106,31 @@ soledad: username: soledad port: 2323 require_couchdb: true +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -220,63 +240,92 @@ x509: -----END CERTIFICATE----- cert: | -----BEGIN CERTIFICATE----- - MIIErzCCApegAwIBAgIQBtxZ63ANP2zxx6O7/c8ASDANBgkqhkiG9w0BAQsFADBK - MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa - BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQwNDA4MDAwMDAwWhcNMTUw - NDA4MDAwMDAwWjAhMR8wHQYDVQQDDBZ1cmNoaW4uZGV2LmJpdG1hc2submV0MIIB - IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqDWdRzzKP/nrzFrPMDtK3EVe - GDfIS6vnzK0wbuNQfLL8Z7l/QZ3EsMN2mMqj9J5hb2rAto/ORWr9kQCRzcOm4tTu - oh8XzLaY8GvrV7WG4IfUIkZDFFrDxilSpNreoz25GucuMwi0sWueXqUy0/s3mnpa - v2MwOPubUmfNPvfKKUmJNvlnwhglTWGXeFJZtBh10q50KLhAjjLixyJ2GlRwl28F - yXTVg6u5Khrb+6jquSCYws6uqTYT3bn96+pmgfkiSZ/4wPBVFhbdticgrgPzEh2N - NRWwtuwrzXzkBwjp/m8U3J1Ht7wA+W5rh4e1y2ey1VQLNn4EUDGiAQfToW/rtwID - AQABo4G5MIG2MB0GA1UdDgQWBBRab/LLDtInNAQuqdXWHLxH3WKsyDA9BgNVHREE - NjA0ghR1cmNoaW4uZGV2LmJpdG1hc2suaYIWdXJjaGluLmRldi5iaXRtYXNrLm5l - dIcEsDVFFTALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF - BwMCMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w - DQYJKoZIhvcNAQELBQADggIBAHRbXhAeqHMuzCT4wMpFYxcaDlPvm8unBDMPrpwl - vvTZmuTBWf6rQpXKUrzxiXUJMib3czk7iM8d9bqU/6D+MFKNJ/XM52ARENFCESwC - nhUPNKywOm7D6gE38qfb7IyJyatWlNflnicS7JuwQuJoyQFWJ8L5vY/8W80/49ia - 4VDFWHQf8fohtX6lxTniXtE4HQ77ziQ9ToxlBEVPeiGU8nImWP8i7ZSptAVVXjpY - ZMUCfSN3O5klCqZPJ25anewQzKC1q1rBhm6q5WFETFRR46qrGhNdQUlbePb/pTBA - UNU5RUMEc034Xi/Q/SMLWbzNMrwu0/thVxtMFLZX5Mk26Toaj+7/YrBeQzQFRXqp - Hr058iDhAVA71ZjfWJqA9hxSQ0CtNZ19J5Xy210Buqz6Z9u8UQbRRa6Py0TJps46 - OIWYyagsDSQF/ieh2m1bEq76GyVlmPyj/YC8jjIytjSplzV3j6x7kk/H6XobVXbZ - UBo5OgzLetxwukbvq5SvBm82kf94619Zrejl5jY+B2z2oDB+9k+qhL1tUerDJloO - lCPLJ/gSrm+SN0x4AVMGShpmxr+VufIOWr8WW6R/nYkpNfSgox/iQnBwuSWE7boM - ybiYSdH+/McFmTTS/zAD9bA3erdGPrbpNhJTNorQ2MYFWF6I8jq/g8pCtwQfDDGl - CFSx + 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 + rbX+vWsGmizCAC6WQXG1QkLa+pM= -----END CERTIFICATE----- commercial_ca_cert: ~ commercial_cert: ~ commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- use: true use_commercial: false diff --git a/hiera/vpn1.yaml b/hiera/vpn1.yaml index 9044837..1de3554 100644 --- a/hiera/vpn1.yaml +++ b/hiera/vpn1.yaml @@ -1,9 +1,4 @@ --- -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se development: @@ -61,6 +56,31 @@ platform: service_type: user_service services: - openvpn +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml index 498106d..6e21263 100644 --- a/hiera/wallaby.yaml +++ b/hiera/wallaby.yaml @@ -2,11 +2,6 @@ api: domain: api.demo.bitmask.net port: 4430 -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - elijah@leap.se - sysdev@leap.se @@ -238,6 +233,31 @@ platform: service_type: public_service services: - webapp +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -308,7 +328,7 @@ webapp: client_certificates: bit_size: 2048 digest: SHA256 - life_span: 2m + life_span: "2 months" limited_prefix: LIMITED unlimited_prefix: UNLIMITED client_version: @@ -334,9 +354,6 @@ webapp: - postmaster - ssladmin - www-data - git: - revision: origin/version/0.6 - source: "https://leap.se/git/leap_web" modules: - billing - help diff --git a/hiera/web1.yaml b/hiera/web1.yaml index 58826ae..a7a01c3 100644 --- a/hiera/web1.yaml +++ b/hiera/web1.yaml @@ -2,11 +2,6 @@ api: domain: api.bitmask.net port: 4430 -apt: - url: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/debian/" - security: "http://security.debian.org/" contacts: - sysdev@leap.se definition_files: @@ -193,6 +188,31 @@ platform: service_type: public_service services: - webapp +sources: + apt: + backports: "http://http.debian.net/debian/" + basic: "http://http.debian.net/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.6.1 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" + type: git squid_deb_proxy_client: true ssh: authorized_keys: @@ -263,7 +283,7 @@ webapp: client_certificates: bit_size: 2048 digest: SHA256 - life_span: 2m + life_span: "2 months" limited_prefix: LIMITED unlimited_prefix: UNLIMITED client_version: @@ -289,9 +309,6 @@ webapp: - postmaster - ssladmin - www-data - git: - revision: origin/version/0.6 - source: "https://leap.se/git/leap_web" modules: - billing - help -- cgit v1.2.3