Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/197331

Change subject: certs: remove compatibility symlinks
......................................................................

certs: remove compatibility symlinks

Per inline TODOs, now that nothing points to those symlinks, remove them
for good, finishing off the /etc/ssl/localcerts migration.

Change-Id: Iebd591668f9005597f9a54b4635ed00c9952e169
---
M manifests/certs.pp
1 file changed, 2 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/197331/1

diff --git a/manifests/certs.pp b/manifests/certs.pp
index 2117faa..9342e83 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -71,11 +71,8 @@
         require => Exec["${name}_create_chained_cert"],
     }
 
-    # TODO: Remove once nothing references this anymore
     file { "/etc/ssl/certs/${certname}.chained.pem":
-        ensure  => link,
-        target  => "${location}/${certname}.chained.crt",
-        require => File["${location}/${certname}.chained.crt"],
+        ensure  => absent,
     }
 }
 
@@ -102,11 +99,8 @@
         require => File['/etc/ssl/localcerts'],
     }
 
-    # TODO: Remove once nothing references this anymore
     file { "/etc/ssl/certs/${name}.pem":
-        ensure  => link,
-        target  => "/etc/ssl/localcerts/${name}.crt",
-        require => File["/etc/ssl/localcerts/${name}.crt"],
+        ensure  => absent,
     }
 
     if ( $privatekey == true ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/197331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebd591668f9005597f9a54b4635ed00c9952e169
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to