BBlack has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/341729 )
Change subject: Move all ssl certs to the module and out of files/ ...................................................................... Move all ssl certs to the module and out of files/ Change-Id: Ic90102f8355ecaf3c7622b8782263cebe6e5bc34 --- R modules/sslcert/files/certs/api.svc.codfw.wmnet.crt R modules/sslcert/files/certs/api.svc.eqiad.wmnet.crt R modules/sslcert/files/certs/appservers.svc.codfw.wmnet.crt R modules/sslcert/files/certs/appservers.svc.eqiad.wmnet.crt R modules/sslcert/files/certs/benefactorevents.wikimedia.org.crt R modules/sslcert/files/certs/blog.wikimedia.org.crt R modules/sslcert/files/certs/digicert-2016-ecdsa-unified.crt R modules/sslcert/files/certs/digicert-2016-rsa-unified.crt R modules/sslcert/files/certs/ecc-star.planet.wikimedia.org.crt R modules/sslcert/files/certs/ecc-star.wmfusercontent.org.crt R modules/sslcert/files/certs/ecc-uni.wikimedia.org.crt R modules/sslcert/files/certs/etcd.codfw.wmnet.crt R modules/sslcert/files/certs/etcd.eqiad.wmnet.crt R modules/sslcert/files/certs/eventdonations.wikimedia.org.crt R modules/sslcert/files/certs/globalsign-2016-ecdsa-unified.crt R modules/sslcert/files/certs/globalsign-2016-rsa-unified.crt R modules/sslcert/files/certs/kubemaster.svc.codfw.wmnet.crt R modules/sslcert/files/certs/kubemaster.svc.eqiad.wmnet.crt R modules/sslcert/files/certs/labtestservices2001.wikimedia.org.crt R modules/sslcert/files/certs/labvirt-star.codfw.wmnet.crt R modules/sslcert/files/certs/labvirt-star.eqiad.wmnet.crt R modules/sslcert/files/certs/ldap-corp.codfw.wikimedia.org.crt R modules/sslcert/files/certs/ldap-corp.eqiad.wikimedia.org.crt R modules/sslcert/files/certs/ldap-labs.codfw.wikimedia.org.crt R modules/sslcert/files/certs/ldap-labs.eqiad.wikimedia.org.crt R modules/sslcert/files/certs/ldap-mirror.wikimedia.org.crt R modules/sslcert/files/certs/lists.wikimedia.org.crt R modules/sslcert/files/certs/mail.wikimedia.org.crt R modules/sslcert/files/certs/ms-fe.svc.codfw.wmnet.crt R modules/sslcert/files/certs/ms-fe.svc.eqiad.wmnet.crt R modules/sslcert/files/certs/policy.wikimedia.org.crt R modules/sslcert/files/certs/rendering.svc.codfw.wmnet.crt R modules/sslcert/files/certs/rendering.svc.eqiad.wmnet.crt R modules/sslcert/files/certs/star.planet.wikimedia.org.crt R modules/sslcert/files/certs/star.tools.wmflabs.org.crt R modules/sslcert/files/certs/star.wmflabs.org.crt R modules/sslcert/files/certs/star.wmfusercontent.org.crt R modules/sslcert/files/certs/uni.wikimedia.org.crt R modules/sslcert/files/certs/virt-star.eqiad.wmnet.crt M modules/sslcert/manifests/certificate.pp M utils/create_ecdsa_cert 41 files changed, 6 insertions(+), 6 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/files/ssl/api.svc.codfw.wmnet.crt b/modules/sslcert/files/certs/api.svc.codfw.wmnet.crt similarity index 100% rename from files/ssl/api.svc.codfw.wmnet.crt rename to modules/sslcert/files/certs/api.svc.codfw.wmnet.crt diff --git a/files/ssl/api.svc.eqiad.wmnet.crt b/modules/sslcert/files/certs/api.svc.eqiad.wmnet.crt similarity index 100% rename from files/ssl/api.svc.eqiad.wmnet.crt rename to modules/sslcert/files/certs/api.svc.eqiad.wmnet.crt diff --git a/files/ssl/appservers.svc.codfw.wmnet.crt b/modules/sslcert/files/certs/appservers.svc.codfw.wmnet.crt similarity index 100% rename from files/ssl/appservers.svc.codfw.wmnet.crt rename to modules/sslcert/files/certs/appservers.svc.codfw.wmnet.crt diff --git a/files/ssl/appservers.svc.eqiad.wmnet.crt b/modules/sslcert/files/certs/appservers.svc.eqiad.wmnet.crt similarity index 100% rename from files/ssl/appservers.svc.eqiad.wmnet.crt rename to modules/sslcert/files/certs/appservers.svc.eqiad.wmnet.crt diff --git a/files/ssl/benefactorevents.wikimedia.org.crt b/modules/sslcert/files/certs/benefactorevents.wikimedia.org.crt similarity index 100% rename from files/ssl/benefactorevents.wikimedia.org.crt rename to modules/sslcert/files/certs/benefactorevents.wikimedia.org.crt diff --git a/files/ssl/blog.wikimedia.org.crt b/modules/sslcert/files/certs/blog.wikimedia.org.crt similarity index 100% rename from files/ssl/blog.wikimedia.org.crt rename to modules/sslcert/files/certs/blog.wikimedia.org.crt diff --git a/files/ssl/digicert-2016-ecdsa-unified.crt b/modules/sslcert/files/certs/digicert-2016-ecdsa-unified.crt similarity index 100% rename from files/ssl/digicert-2016-ecdsa-unified.crt rename to modules/sslcert/files/certs/digicert-2016-ecdsa-unified.crt diff --git a/files/ssl/digicert-2016-rsa-unified.crt b/modules/sslcert/files/certs/digicert-2016-rsa-unified.crt similarity index 100% rename from files/ssl/digicert-2016-rsa-unified.crt rename to modules/sslcert/files/certs/digicert-2016-rsa-unified.crt diff --git a/files/ssl/ecc-star.planet.wikimedia.org.crt b/modules/sslcert/files/certs/ecc-star.planet.wikimedia.org.crt similarity index 100% rename from files/ssl/ecc-star.planet.wikimedia.org.crt rename to modules/sslcert/files/certs/ecc-star.planet.wikimedia.org.crt diff --git a/files/ssl/ecc-star.wmfusercontent.org.crt b/modules/sslcert/files/certs/ecc-star.wmfusercontent.org.crt similarity index 100% rename from files/ssl/ecc-star.wmfusercontent.org.crt rename to modules/sslcert/files/certs/ecc-star.wmfusercontent.org.crt diff --git a/files/ssl/ecc-uni.wikimedia.org.crt b/modules/sslcert/files/certs/ecc-uni.wikimedia.org.crt similarity index 100% rename from files/ssl/ecc-uni.wikimedia.org.crt rename to modules/sslcert/files/certs/ecc-uni.wikimedia.org.crt diff --git a/files/ssl/etcd.codfw.wmnet.crt b/modules/sslcert/files/certs/etcd.codfw.wmnet.crt similarity index 100% rename from files/ssl/etcd.codfw.wmnet.crt rename to modules/sslcert/files/certs/etcd.codfw.wmnet.crt diff --git a/files/ssl/etcd.eqiad.wmnet.crt b/modules/sslcert/files/certs/etcd.eqiad.wmnet.crt similarity index 100% rename from files/ssl/etcd.eqiad.wmnet.crt rename to modules/sslcert/files/certs/etcd.eqiad.wmnet.crt diff --git a/files/ssl/eventdonations.wikimedia.org.crt b/modules/sslcert/files/certs/eventdonations.wikimedia.org.crt similarity index 100% rename from files/ssl/eventdonations.wikimedia.org.crt rename to modules/sslcert/files/certs/eventdonations.wikimedia.org.crt diff --git a/files/ssl/globalsign-2016-ecdsa-unified.crt b/modules/sslcert/files/certs/globalsign-2016-ecdsa-unified.crt similarity index 100% rename from files/ssl/globalsign-2016-ecdsa-unified.crt rename to modules/sslcert/files/certs/globalsign-2016-ecdsa-unified.crt diff --git a/files/ssl/globalsign-2016-rsa-unified.crt b/modules/sslcert/files/certs/globalsign-2016-rsa-unified.crt similarity index 100% rename from files/ssl/globalsign-2016-rsa-unified.crt rename to modules/sslcert/files/certs/globalsign-2016-rsa-unified.crt diff --git a/files/ssl/kubemaster.svc.codfw.wmnet.crt b/modules/sslcert/files/certs/kubemaster.svc.codfw.wmnet.crt similarity index 100% rename from files/ssl/kubemaster.svc.codfw.wmnet.crt rename to modules/sslcert/files/certs/kubemaster.svc.codfw.wmnet.crt diff --git a/files/ssl/kubemaster.svc.eqiad.wmnet.crt b/modules/sslcert/files/certs/kubemaster.svc.eqiad.wmnet.crt similarity index 100% rename from files/ssl/kubemaster.svc.eqiad.wmnet.crt rename to modules/sslcert/files/certs/kubemaster.svc.eqiad.wmnet.crt diff --git a/files/ssl/labtestservices2001.wikimedia.org.crt b/modules/sslcert/files/certs/labtestservices2001.wikimedia.org.crt similarity index 100% rename from files/ssl/labtestservices2001.wikimedia.org.crt rename to modules/sslcert/files/certs/labtestservices2001.wikimedia.org.crt diff --git a/files/ssl/labvirt-star.codfw.wmnet.crt b/modules/sslcert/files/certs/labvirt-star.codfw.wmnet.crt similarity index 100% rename from files/ssl/labvirt-star.codfw.wmnet.crt rename to modules/sslcert/files/certs/labvirt-star.codfw.wmnet.crt diff --git a/files/ssl/labvirt-star.eqiad.wmnet.crt b/modules/sslcert/files/certs/labvirt-star.eqiad.wmnet.crt similarity index 100% rename from files/ssl/labvirt-star.eqiad.wmnet.crt rename to modules/sslcert/files/certs/labvirt-star.eqiad.wmnet.crt diff --git a/files/ssl/ldap-corp.codfw.wikimedia.org.crt b/modules/sslcert/files/certs/ldap-corp.codfw.wikimedia.org.crt similarity index 100% rename from files/ssl/ldap-corp.codfw.wikimedia.org.crt rename to modules/sslcert/files/certs/ldap-corp.codfw.wikimedia.org.crt diff --git a/files/ssl/ldap-corp.eqiad.wikimedia.org.crt b/modules/sslcert/files/certs/ldap-corp.eqiad.wikimedia.org.crt similarity index 100% rename from files/ssl/ldap-corp.eqiad.wikimedia.org.crt rename to modules/sslcert/files/certs/ldap-corp.eqiad.wikimedia.org.crt diff --git a/files/ssl/ldap-labs.codfw.wikimedia.org.crt b/modules/sslcert/files/certs/ldap-labs.codfw.wikimedia.org.crt similarity index 100% rename from files/ssl/ldap-labs.codfw.wikimedia.org.crt rename to modules/sslcert/files/certs/ldap-labs.codfw.wikimedia.org.crt diff --git a/files/ssl/ldap-labs.eqiad.wikimedia.org.crt b/modules/sslcert/files/certs/ldap-labs.eqiad.wikimedia.org.crt similarity index 100% rename from files/ssl/ldap-labs.eqiad.wikimedia.org.crt rename to modules/sslcert/files/certs/ldap-labs.eqiad.wikimedia.org.crt diff --git a/files/ssl/ldap-mirror.wikimedia.org.crt b/modules/sslcert/files/certs/ldap-mirror.wikimedia.org.crt similarity index 100% rename from files/ssl/ldap-mirror.wikimedia.org.crt rename to modules/sslcert/files/certs/ldap-mirror.wikimedia.org.crt diff --git a/files/ssl/lists.wikimedia.org.crt b/modules/sslcert/files/certs/lists.wikimedia.org.crt similarity index 100% rename from files/ssl/lists.wikimedia.org.crt rename to modules/sslcert/files/certs/lists.wikimedia.org.crt diff --git a/files/ssl/mail.wikimedia.org.crt b/modules/sslcert/files/certs/mail.wikimedia.org.crt similarity index 100% rename from files/ssl/mail.wikimedia.org.crt rename to modules/sslcert/files/certs/mail.wikimedia.org.crt diff --git a/files/ssl/ms-fe.svc.codfw.wmnet.crt b/modules/sslcert/files/certs/ms-fe.svc.codfw.wmnet.crt similarity index 100% rename from files/ssl/ms-fe.svc.codfw.wmnet.crt rename to modules/sslcert/files/certs/ms-fe.svc.codfw.wmnet.crt diff --git a/files/ssl/ms-fe.svc.eqiad.wmnet.crt b/modules/sslcert/files/certs/ms-fe.svc.eqiad.wmnet.crt similarity index 100% rename from files/ssl/ms-fe.svc.eqiad.wmnet.crt rename to modules/sslcert/files/certs/ms-fe.svc.eqiad.wmnet.crt diff --git a/files/ssl/policy.wikimedia.org.crt b/modules/sslcert/files/certs/policy.wikimedia.org.crt similarity index 100% rename from files/ssl/policy.wikimedia.org.crt rename to modules/sslcert/files/certs/policy.wikimedia.org.crt diff --git a/files/ssl/rendering.svc.codfw.wmnet.crt b/modules/sslcert/files/certs/rendering.svc.codfw.wmnet.crt similarity index 100% rename from files/ssl/rendering.svc.codfw.wmnet.crt rename to modules/sslcert/files/certs/rendering.svc.codfw.wmnet.crt diff --git a/files/ssl/rendering.svc.eqiad.wmnet.crt b/modules/sslcert/files/certs/rendering.svc.eqiad.wmnet.crt similarity index 100% rename from files/ssl/rendering.svc.eqiad.wmnet.crt rename to modules/sslcert/files/certs/rendering.svc.eqiad.wmnet.crt diff --git a/files/ssl/star.planet.wikimedia.org.crt b/modules/sslcert/files/certs/star.planet.wikimedia.org.crt similarity index 100% rename from files/ssl/star.planet.wikimedia.org.crt rename to modules/sslcert/files/certs/star.planet.wikimedia.org.crt diff --git a/files/ssl/star.tools.wmflabs.org.crt b/modules/sslcert/files/certs/star.tools.wmflabs.org.crt similarity index 100% rename from files/ssl/star.tools.wmflabs.org.crt rename to modules/sslcert/files/certs/star.tools.wmflabs.org.crt diff --git a/files/ssl/star.wmflabs.org.crt b/modules/sslcert/files/certs/star.wmflabs.org.crt similarity index 100% rename from files/ssl/star.wmflabs.org.crt rename to modules/sslcert/files/certs/star.wmflabs.org.crt diff --git a/files/ssl/star.wmfusercontent.org.crt b/modules/sslcert/files/certs/star.wmfusercontent.org.crt similarity index 100% rename from files/ssl/star.wmfusercontent.org.crt rename to modules/sslcert/files/certs/star.wmfusercontent.org.crt diff --git a/files/ssl/uni.wikimedia.org.crt b/modules/sslcert/files/certs/uni.wikimedia.org.crt similarity index 100% rename from files/ssl/uni.wikimedia.org.crt rename to modules/sslcert/files/certs/uni.wikimedia.org.crt diff --git a/files/ssl/virt-star.eqiad.wmnet.crt b/modules/sslcert/files/certs/virt-star.eqiad.wmnet.crt similarity index 100% rename from files/ssl/virt-star.eqiad.wmnet.crt rename to modules/sslcert/files/certs/virt-star.eqiad.wmnet.crt diff --git a/modules/sslcert/manifests/certificate.pp b/modules/sslcert/manifests/certificate.pp index 3f199e2..347d4e1 100644 --- a/modules/sslcert/manifests/certificate.pp +++ b/modules/sslcert/manifests/certificate.pp @@ -9,9 +9,9 @@ # # The input pathnames for the cert and the private key are fixed at our # standard locations and based on the resource's title. For example, if the -# resource title is "foo", the cert source will be "files/ssl/foo.crt", and the -# private key should be located at "modules/secret/secrets/ssl/foo.key" in the -# private repository. +# resource title is "foo", the cert source will be "modules/sslcert/files/certs/foo.crt", +# and the private key should be located at "modules/secret/secrets/ssl/foo.key" +# in the private repository. # # === Parameters # @@ -56,7 +56,7 @@ owner => 'root', group => $group, mode => '0444', - source => "puppet:///files/ssl/${title}.crt", + source => "puppet:///modules/sslcert/certs/${title}.crt", } } else { file { "/etc/ssl/localcerts/${title}.crt": diff --git a/utils/create_ecdsa_cert b/utils/create_ecdsa_cert index 6495824..2780f31 100755 --- a/utils/create_ecdsa_cert +++ b/utils/create_ecdsa_cert @@ -30,6 +30,6 @@ ssh $_puppetmaster sudo git -C /srv/private add "modules/secret/secrets/ssl/${name}.key" echo "Private key generated and added to the private git repo. Don't forget to commit it!" scp "$_puppetmaster:/var/lib/puppet/server/ssl/ca/signed/${name}.pem" \ - "${_dir}/../files/ssl/${name}.crt" -git add "${_dir}/../files/ssl/${name}.crt" + "${_dir}/../modules/sslcert/files/certs/${name}.crt" +git add "${_dir}/../modules/sslcert/files/certs/${name}.crt" echo "Public key generated and added to git" -- To view, visit https://gerrit.wikimedia.org/r/341729 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic90102f8355ecaf3c7622b8782263cebe6e5bc34 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Chad <ch...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Chad <ch...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Ema <e...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: RobH <r...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits