Mercurial > repos > other > Puppet

changeset 396:e93588ec1ce3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use "param" variables for settings instead of conditions
author IBBoard <dev@ibboard.co.uk>
date Mon, 18 Apr 2022 10:38:28 +0100
parents fa2747b27bb4
children e22eee1d79ef
files manifests/templates.pp
diffstat 1 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/manifests/templates.pp	Mon Apr 18 10:37:00 2022 +0100
+++ b/manifests/templates.pp	Mon Apr 18 10:38:28 2022 +0100
@@ -100,7 +100,10 @@
 	include basenode
 	include privat
 	include dnsresolver
-	include ::ssh
+	include ::privat::params
+	class { '::ssh':
+		sshd_config_port => $::privat::params::ssh_port[$::fqdn]
+	}
 	include vcs::server
 	include vcs::client
 	class { 'webserver':
@@ -748,15 +751,10 @@
 		ssl_ca_chain => '',
 		custom_fragment => template("privat/apache/webmail.fragment"),
 	}
-	if $osfamily == 'RedHat' {
-		$pim_user = 'apache'
-	}
-	elsif $osfamily == 'Debian' {
-		$pim_user = 'www-data'
-	}
+	include ::apache::params
 	website::https { 'pim.ibboard.co.uk':
 		proxy_4to6_ip => $proxy_4to6_ip_pim,
-		docroot_owner => $pim_user,
+		docroot_owner => $apache::params::user,
 		docroot_group => 'editors',
 		force_no_index => false,
 		lockdown_requests => false,