coren has submitted this change and it was merged.
Change subject: Tool Labs: make webservers proper submit hosts
......................................................................
Tool Labs: make webservers proper submit hosts
Since webservers are meant to be submit hosts like the bastions,
their sshd_config also needs to be updated to allow HBA.
Change-Id: Id17ca4f845188003f08961b1a4d832776a96c074
---
R modules/toollabs/files/submithost-ssh_config
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/webserver.pp
3 files changed, 9 insertions(+), 1 deletion(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/files/bastion-ssh_config
b/modules/toollabs/files/submithost-ssh_config
similarity index 100%
rename from modules/toollabs/files/bastion-ssh_config
rename to modules/toollabs/files/submithost-ssh_config
diff --git a/modules/toollabs/manifests/bastion.pp
b/modules/toollabs/manifests/bastion.pp
index 5704d41..237c496 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -21,7 +21,7 @@
mode => "0444",
owner => "root",
group => "root",
- source => "puppet:///modules/toollabs/bastion-ssh_config",
+ source => "puppet:///modules/toollabs/submithost-ssh_config",
}
class { 'gridengine::submit_host':
diff --git a/modules/toollabs/manifests/webserver.pp
b/modules/toollabs/manifests/webserver.pp
index 6ff3ffa..015293a 100644
--- a/modules/toollabs/manifests/webserver.pp
+++ b/modules/toollabs/manifests/webserver.pp
@@ -34,6 +34,14 @@
content => "$ipaddress\n",
}
+ file { "/etc/ssh/ssh_config":
+ ensure => file,
+ mode => "0444",
+ owner => "root",
+ group => "root",
+ source => "puppet:///modules/toollabs/submithost-ssh_config",
+ }
+
# TODO: Apache config
# TODO: Local scripts
}
--
To view, visit https://gerrit.wikimedia.org/r/81947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id17ca4f845188003f08961b1a4d832776a96c074
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
