Merge pull request #6 from silverstripeltd/fix/env-file-url-map

Ensure domain_name is available to templates where used
silverstripeltd · May 24, 2020 · f5133c0 · f5133c0
2 parents 5154f9a + 597a681
commit f5133c0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/manifests/apache.pp b/manifests/apache.pp
@@ -1,5 +1,6 @@
 define ss_sushi::apache (
 	$env_vars,
+	$domain_name,
 	$ops_env_vars = undef,
 	$root_dir = '/etc/apache2/platform-variables',
 	$vhost_name = 'mysite',

diff --git a/manifests/cli.pp b/manifests/cli.pp
@@ -1,5 +1,6 @@
 define ss_sushi::cli (
 	$env_vars,
+	$domain_name,
 	$ops_env_vars = undef,
 	$root_dir = '/etc/platform-variables',
 	$vhost_root = '/var/www',

diff --git a/manifests/ss_env.pp b/manifests/ss_env.pp
@@ -1,5 +1,6 @@
 define ss_sushi::ss_env (
 	$env_vars,
+	$domain_name,
 	$ops_env_vars = undef,
 	$root_dir = '/var/www',
 	$vhost_name = 'mysite',

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -16,6 +16,7 @@
 ) {
 	ss_sushi::apache { "${vhost_name}/10-master.conf":
 		env_vars            => $env_vars,
+		domain_name         => $domain_name,
 		ops_env_vars        => $ops_env_vars,
 		vhost_name          => $vhost_name,
 		root_dir            => $apache_root,
@@ -26,6 +27,7 @@
 
 	ss_sushi::cli { "${vhost_name}/10-master.conf":
 		env_vars     => $env_vars,
+		domain_name  => $domain_name,
 		ops_env_vars => $ops_env_vars,
 		vhost_name   => $vhost_name,
 		vhost_root   => $vhost_root,
@@ -36,6 +38,7 @@
 
 	ss_sushi::ss_env { "${vhost_name}/_ss_environment.php":
 		env_vars     => $env_vars,
+		domain_name  => $domain_name,
 		vhost_name   => $vhost_name,
 		ops_env_vars => $ops_env_vars,
 		root_dir     => $vhost_root,