[MediaWiki-commits] [Gerrit] operations/puppet[production]: sshd-phab service config needs to be a template

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338302 )

Change subject: sshd-phab service config needs to be a template
......................................................................


sshd-phab service config needs to be a template

Can't use variables (erb) with plain file source => references

Change-Id: I2ec5deb3b2257880e34c6609a73a9121d7039b34
---
M modules/phabricator/manifests/vcs.pp
R modules/phabricator/templates/sshd-phab.conf.erb
R modules/phabricator/templates/sshd-phab.service.erb
3 files changed, 3 insertions(+), 4 deletions(-)

Approvals:
  Paladox: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/phabricator/manifests/vcs.pp 
b/modules/phabricator/manifests/vcs.pp
index 7581970..7cb5ea6 100644
--- a/modules/phabricator/manifests/vcs.pp
+++ b/modules/phabricator/manifests/vcs.pp
@@ -27,7 +27,6 @@
     $ssh_hook_path = '/usr/local/lib/phabricator-ssh-hook.sh'
     $sshd_config = '/etc/ssh/sshd_config.phabricator'
 
-
     user { $vcs_user:
         gid        => 'phd',
         shell      => '/bin/sh',
@@ -95,14 +94,14 @@
 
     if $::initsystem == 'upstart' {
         $init_file = '/etc/init/ssh-phab.conf'
-        $init_soorce = 'puppet:///modules/phabricator/sshd-phab.conf'
+        $init_template = 'phabricator/sshd-phab.conf.erb'
     } else {
         $init_file = '/etc/systemd/system/ssh-phab.service'
-        $init_source = 'puppet:///modules/phabricator/sshd-phab.service'
+        $init_template = 'phabricator/sshd-phab.service.erb'
     }
 
     file { $init_file:
-        source  => $init_source,
+        content => template($init_template),
         mode    => '0644',
         owner   => 'root',
         group   => 'root',
diff --git a/modules/phabricator/files/sshd-phab.conf 
b/modules/phabricator/templates/sshd-phab.conf.erb
similarity index 100%
rename from modules/phabricator/files/sshd-phab.conf
rename to modules/phabricator/templates/sshd-phab.conf.erb
diff --git a/modules/phabricator/files/sshd-phab.service 
b/modules/phabricator/templates/sshd-phab.service.erb
similarity index 100%
rename from modules/phabricator/files/sshd-phab.service
rename to modules/phabricator/templates/sshd-phab.service.erb

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ec5deb3b2257880e34c6609a73a9121d7039b34
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 <mmod...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>

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