summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2020-06-21 18:34:09 +0200
committerJan Dittberner <jandd@cacert.org>2020-06-21 18:35:10 +0200
commitbecf068ba97305a2662c52d20bb1cac33df9d764 (patch)
treed6417e38384c60d8d69f5a93dca217e1f8ad4c9e
parent7029b831e30e067f05d1c469dc4a4bc696d21677 (diff)
downloadcacert-puppet-becf068ba97305a2662c52d20bb1cac33df9d764.tar.gz
cacert-puppet-becf068ba97305a2662c52d20bb1cac33df9d764.tar.xz
cacert-puppet-becf068ba97305a2662c52d20bb1cac33df9d764.zip
Fix yamllint warnings for hiera data
-rw-r--r--.yamllint8
-rw-r--r--hieradata/common.yaml2
-rw-r--r--hieradata/nodes/email.yaml12
-rw-r--r--hieradata/nodes/monitor.yaml2
-rw-r--r--hieradata/nodes/proxyout.yaml112
5 files changed, 72 insertions, 64 deletions
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..e58bf14
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,8 @@
+---
+# Based on ansible-lint config
+extends: default
+
+rules:
+ line-length: disable
+ new-lines:
+ type: unix
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 89bc2e8..5d0780a 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -19,7 +19,7 @@ profiles::base::users:
-
name: edgepolster
type: ssh-rsa
- key: ENC[PKCS7,MIIC7QYJKoZIhvcNAQcDoIIC3jCCAtoCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAuTm982b9l+AXsDMkM/XlAc2o5oiAxSHN/rEObWnGL+9SkJj22Ln8otYymPZ/LfePrAKT5X0Bl+sek1Z3/KIsIulnKibHYwb3Nd3zwa1YyrxyFcLAg993Fb8aO3/lTZ6QMkuowKRB2bNheYOl6kwgnfEHMEi06V7owHoPriOTQpH1sKrcIdJX0sefFhttC6LMDxZKEWJuRcGTGSSZx0g0Q9bKIxElKScAuK3+ptm50m688yOgvlG5EZeR9fKGlDXRK2D451mg74GvE1NwOcO8fdXOPXFKeQzsN2duKFvPbJl8BWswaQfyhqzqJmUU17wz10Va6v8R93fEnjyUJRdB7TCCAa4GCSqGSIb3DQEHATAdBglghkgBZQMEASoEEIRyL9YjKiYbINKg++yNxOeAggGAII9L0zWfvwFG9PntQVWnWhgAkHzJj5iWli4DrKlRIxI63jXyEbCEgNKl7sl5BT5nGb89KPHbCG7HD/HoVRSHe1hBMRB77CmN8xXIwT0ZKGszPAjOSOEwySOPgbASHJaiY7hMJTBXp3uIQEJ4iXhv0cZBeP40XBFsHpjVEkrgF1qoFYNn7HgJ0E6M/yRNjvD/1WCwj/hvZhcdIkyHVXiicB03I4Vuk5PwTEJ6O0WQgMcEePdYfRoVNneewed1E1ytqRHcL+qalfyG7VfhseNwDyngIhaF8JlMtXMfMWa1uZsj58v2Hx48b61jKn39a6CLJNl+KmmErLcja4i8LmJzM+e2sPJJu5MGfNddlCC3elwOmtHUL9ZI1mXFiInQfBRfV1WWjyP5556XakKXWL4KYPQdXUNXZCsHgmzlaulyCyYMx7grXo+dz4DXriZZ1BHrOYnEbyzZE44m2uoaCpB8X7cGCAtAEWPU7vbAEEA0EtpvgssAiRI9cKZTfxTZ9Ass]
+ key: ENC[PKCS7,MIIC7QYJKoZIhvcNAQcDoIIC3jCCAtoCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAuTm982b9l+AXsDMkM/XlAc2o5oiAxSHN/rEObWnGL+9SkJj22Ln8otYymPZ/LfePrAKT5X0Bl+sek1Z3/KIsIulnKibHYwb3Nd3zwa1YyrxyFcLAg993Fb8aO3/lTZ6QMkuowKRB2bNheYOl6kwgnfEHMEi06V7owHoPriOTQpH1sKrcIdJX0sefFhttC6LMDxZKEWJuRcGTGSSZx0g0Q9bKIxElKScAuK3+ptm50m688yOgvlG5EZeR9fKGlDXRK2D451mg74GvE1NwOcO8fdXOPXFKeQzsN2duKFvPbJl8BWswaQfyhqzqJmUU17wz10Va6v8R93fEnjyUJRdB7TCCAa4GCSqGSIb3DQEHATAdBglghkgBZQMEASoEEIRyL9YjKiYbINKg++yNxOeAggGAII9L0zWfvwFG9PntQVWnWhgAkHzJj5iWli4DrKlRIxI63jXyEbCEgNKl7sl5BT5nGb89KPHbCG7HD/HoVRSHe1hBMRB77CmN8xXIwT0ZKGszPAjOSOEwySOPgbASHJaiY7hMJTBXp3uIQEJ4iXhv0cZBeP40XBFsHpjVEkrgF1qoFYNn7HgJ0E6M/yRNjvD/1WCwj/hvZhcdIkyHVXiicB03I4Vuk5PwTEJ6O0WQgMcEePdYfRoVNneewed1E1ytqRHcL+qalfyG7VfhseNwDyngIhaF8JlMtXMfMWa1uZsj58v2Hx48b61jKn39a6CLJNl+KmmErLcja4i8LmJzM+e2sPJJu5MGfNddlCC3elwOmtHUL9ZI1mXFiInQfBRfV1WWjyP5556XakKXWL4KYPQdXUNXZCsHgmzlaulyCyYMx7grXo+dz4DXriZZ1BHrOYnEbyzZE44m2uoaCpB8X7cGCAtAEWPU7vbAEEA0EtpvgssAiRI9cKZTfxTZ9Ass]
-
name: nitrokey
type: ssh-rsa
diff --git a/hieradata/nodes/email.yaml b/hieradata/nodes/email.yaml
index 876c329..e287fa6 100644
--- a/hieradata/nodes/email.yaml
+++ b/hieradata/nodes/email.yaml
@@ -17,12 +17,12 @@ profiles::icinga2_agent::pki_ticket: >
qDUegDB5FE/kCJHikejLTd9x65fkNuaUMs9uTYaTUydsk/yPsD/fZWpRU3hM
nUgJAjygFfc=]
profiles::cacert_selfservice_api::client_identities:
-- id: cac3ad11-fa50-43f6-8ded-15f598b6ca2a
- key: |
- -----BEGIN PUBLIC KEY-----
- MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEAKRX/fSOOunEETpHqPKj8k1/zv1R
- 0J/6SxMU+jix4InG1tFL6yiikQqZMY9Gu4yYgF/WhiLrgjPbaGvlln0/FA==
- -----END PUBLIC KEY-----
+ - id: cac3ad11-fa50-43f6-8ded-15f598b6ca2a
+ key: |
+ -----BEGIN PUBLIC KEY-----
+ MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEAKRX/fSOOunEETpHqPKj8k1/zv1R
+ 0J/6SxMU+jix4InG1tFL6yiikQqZMY9Gu4yYgF/WhiLrgjPbaGvlln0/FA==
+ -----END PUBLIC KEY-----
profiles::cacert_selfservice_api::db_password: >
ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEw
DQYJKoZIhvcNAQEBBQAEggEAjOBz2QKZTSY8lyV3SWjjatpm4CdVHPr4kfmx
diff --git a/hieradata/nodes/monitor.yaml b/hieradata/nodes/monitor.yaml
index eda52c9..49fb339 100644
--- a/hieradata/nodes/monitor.yaml
+++ b/hieradata/nodes/monitor.yaml
@@ -45,7 +45,7 @@ profiles::icinga2_master::ido_database_password: >
profiles::icinga2_master::api_users:
root:
target: /etc/icinga2/features-available/api.conf
- password: >
+ password: >
ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEw
DQYJKoZIhvcNAQEBBQAEggEAAXgaqzTk009MfssP5rTCvy5jC0j3Fq76LjSO
OQPj+ig09ExElNIDMQwJJCgKUXpdPJsaNPHC69BpvHzKi1HWWmk0Km587cI5
diff --git a/hieradata/nodes/proxyout.yaml b/hieradata/nodes/proxyout.yaml
index 0d1a54f..b36ad25 100644
--- a/hieradata/nodes/proxyout.yaml
+++ b/hieradata/nodes/proxyout.yaml
@@ -5,61 +5,61 @@ profiles::base::admins:
- jandd
- law
profiles::squid::acls:
- - "blog src 10.0.0.13"
- - "blog src 172.16.2.13"
- - "jenkins src 10.0.0.115"
- - "jenkins src 172.16.2.115"
- - "puppet src 172.16.2.10"
- - "test src 172.16.2.248"
- - "testmgr src 172.16.2.10"
- - "wiki src 10.0.0.12"
- - "wiki src 172.16.2.12"
- - "cacert dstdomain .cacert.org"
- - "debjenkins dstdomain archives.jenkins-ci.org"
- - "debjenkins dstdomain ftp-chi.osuosl.org"
- - "debjenkins dstdomain ftp-nyc.osuosl.org"
- - "debjenkins dstdomain ftp.yz.yamagata-u.ac.jp"
- - "debjenkins dstdomain mirror.esuni.jp"
- - "debjenkins dstdomain mirrors.jenkins.io"
- - "debjenkins dstdomain mirrors.seville-jam.es"
- - "debjenkins dstdomain mirrors.tuna.tsinghua.edu.cn"
- - "debjenkins dstdomain pkg.jenkins-ci.org"
- - "debjenkins dstdomain pkg.jenkins.io"
- - "debjenkins dstdomain prodjenkinsreleases.blob.core.windows.net"
- - "debmariadb dstdomain mirror2.hs-esslingen.de"
- - "debmirror dstdomain .debian.org"
- - "debnginx dstdomain packages.nginx.org"
- - "debpgsql dstdomain apt.postgresql.org"
- - "debpuppet dstdomain apt.puppet.com"
- - "debpuppet dstdomain apt.puppetlabs.com"
- - "github dstdomain github.com"
- - "puppetforge dstdomain forgeapi.puppetlabs.com"
- - "pypi dstdomain .pythonhosted.org"
- - "pypi dstdomain pypi.org"
- - "rubygems dstdomain api.rubygems.org"
- - "wordpress dstdomain .wordpress.org"
+ - "blog src 10.0.0.13"
+ - "blog src 172.16.2.13"
+ - "jenkins src 10.0.0.115"
+ - "jenkins src 172.16.2.115"
+ - "puppet src 172.16.2.10"
+ - "test src 172.16.2.248"
+ - "testmgr src 172.16.2.10"
+ - "wiki src 10.0.0.12"
+ - "wiki src 172.16.2.12"
+ - "cacert dstdomain .cacert.org"
+ - "debjenkins dstdomain archives.jenkins-ci.org"
+ - "debjenkins dstdomain ftp-chi.osuosl.org"
+ - "debjenkins dstdomain ftp-nyc.osuosl.org"
+ - "debjenkins dstdomain ftp.yz.yamagata-u.ac.jp"
+ - "debjenkins dstdomain mirror.esuni.jp"
+ - "debjenkins dstdomain mirrors.jenkins.io"
+ - "debjenkins dstdomain mirrors.seville-jam.es"
+ - "debjenkins dstdomain mirrors.tuna.tsinghua.edu.cn"
+ - "debjenkins dstdomain pkg.jenkins-ci.org"
+ - "debjenkins dstdomain pkg.jenkins.io"
+ - "debjenkins dstdomain prodjenkinsreleases.blob.core.windows.net"
+ - "debmariadb dstdomain mirror2.hs-esslingen.de"
+ - "debmirror dstdomain .debian.org"
+ - "debnginx dstdomain packages.nginx.org"
+ - "debpgsql dstdomain apt.postgresql.org"
+ - "debpuppet dstdomain apt.puppet.com"
+ - "debpuppet dstdomain apt.puppetlabs.com"
+ - "github dstdomain github.com"
+ - "puppetforge dstdomain forgeapi.puppetlabs.com"
+ - "pypi dstdomain .pythonhosted.org"
+ - "pypi dstdomain pypi.org"
+ - "rubygems dstdomain api.rubygems.org"
+ - "wordpress dstdomain .wordpress.org"
profiles::squid::http_access:
- - "allow localnet cacert"
- - "allow localnet debmariadb"
- - "allow localnet debmirror"
- - "allow localnet debpuppet"
- - "allow blog wordpress"
- - "allow jenkins debjenkins"
- - "allow jenkins github"
- - "allow jenkins pypi"
- - "allow puppet puppetforge"
- - "allow puppet rubygems"
- - "allow test github"
- - "allow testmgr github"
- - "allow wiki debnginx"
+ - "allow localnet cacert"
+ - "allow localnet debmariadb"
+ - "allow localnet debmirror"
+ - "allow localnet debpuppet"
+ - "allow blog wordpress"
+ - "allow jenkins debjenkins"
+ - "allow jenkins github"
+ - "allow jenkins pypi"
+ - "allow puppet puppetforge"
+ - "allow puppet rubygems"
+ - "allow test github"
+ - "allow testmgr github"
+ - "allow wiki debnginx"
profiles::icinga2_agent::pki_ticket: >
- ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEw
- DQYJKoZIhvcNAQEBBQAEggEAm5KSv0YCITiy1Ksq18qTDh9IrErDZXBC+Uk5
- MHMtqKeqVrXurra+1Re1hARt0dp4UblCduCJB7P9Ui49WTNI86zY9vippZwn
- 3kDvGGb3863uPyTIL0P815EMJBy5fp4LtdbhGe292X1YT8gG02NIHK9RP+Vy
- HfEatEXnqALc4Cl8DrQIJX6SbovMGk5UsruVIvx7vS0SNt+3S2OuBXey3ytY
- oM50z2rhC2W6U0Lx+WP6O9qvkBEkk0XRcItbSikOCtdyx8HmNMBgvk9Ua2Ez
- 6jcCKK7C3dVgP1ozePBe3mLtoW/1CMa7DW3GXZlvAmPVAXrgq3p38tU9cLgn
- l3OItTBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDuDYIvmEvS8bxxG+X6
- dooHgDC34jNr87PoPPOatjAils7c2P/+X7oJmKrXBFJDbkoq2AvbdsYh3xrh
- oXDvD84MDl8=]
+ ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEw
+ DQYJKoZIhvcNAQEBBQAEggEAm5KSv0YCITiy1Ksq18qTDh9IrErDZXBC+Uk5
+ MHMtqKeqVrXurra+1Re1hARt0dp4UblCduCJB7P9Ui49WTNI86zY9vippZwn
+ 3kDvGGb3863uPyTIL0P815EMJBy5fp4LtdbhGe292X1YT8gG02NIHK9RP+Vy
+ HfEatEXnqALc4Cl8DrQIJX6SbovMGk5UsruVIvx7vS0SNt+3S2OuBXey3ytY
+ oM50z2rhC2W6U0Lx+WP6O9qvkBEkk0XRcItbSikOCtdyx8HmNMBgvk9Ua2Ez
+ 6jcCKK7C3dVgP1ozePBe3mLtoW/1CMa7DW3GXZlvAmPVAXrgq3p38tU9cLgn
+ l3OItTBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDuDYIvmEvS8bxxG+X6
+ dooHgDC34jNr87PoPPOatjAils7c2P/+X7oJmKrXBFJDbkoq2AvbdsYh3xrh
+ oXDvD84MDl8=]