Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: base::service_unit: ship systemd units in /lib
......................................................................

base::service_unit: ship systemd units in /lib

When shipping systemd unit files in /etc there are a couple of commands
that break. Specifically mask/unmask break because they rely in removing
the /etc/systemd/system/<service>.service file and replacing it with a
symlink to /dev/null. However it the mask command finds an actual file
in that place, it will fail. Amend base::service_unit to ship files in
the /lib/systemd/system which is the standard place anyway for shipping
systemd unit files. This unbreaks the mask command and conforms to the
standard behavior anyway.

Change-Id: Ia600f969da73ae33bf4476d06079c5d333b4c304
---
M modules/base/manifests/service_unit.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/233626/1

diff --git a/modules/base/manifests/service_unit.pp 
b/modules/base/manifests/service_unit.pp
index b0d79b9..cef2903 100644
--- a/modules/base/manifests/service_unit.pp
+++ b/modules/base/manifests/service_unit.pp
@@ -85,7 +85,7 @@
         }
 
         $path = $initscript ? {
-            'systemd'  => "/etc/systemd/system/${name}.service",
+            'systemd'  => "/lib/systemd/system/${name}.service",
             'upstart'  => "/etc/init/${name}.conf",
             default    => "/etc/init.d/${name}"
         }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia600f969da73ae33bf4476d06079c5d333b4c304
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to