From 8c44e7960368e6faead15ac9c6371c4293bb6a1e Mon Sep 17 00:00:00 2001
From: Pekka Helenius <35750356+Fincer-altego@users.noreply.github.com>
Date: Tue, 24 Apr 2018 02:00:24 +0300
Subject: [PATCH] Update salt_pillar_apache_sample.sh

---
 scripts/salt_pillar_apache_sample.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/scripts/salt_pillar_apache_sample.sh b/scripts/salt_pillar_apache_sample.sh
index 512415f..72f1799 100644
--- a/scripts/salt_pillar_apache_sample.sh
+++ b/scripts/salt_pillar_apache_sample.sh
@@ -34,8 +34,8 @@ SITE_DATA
 
 tee /srv/salt/apache/samplesite.conf <<SAMPLE_SITE
 <VirtualHost *:80>
-    ServerName {{ (grains['os'].lower() + '.' + grains['id'] + '.com') }}
-    ServerAlias {{ ('www.' + grains['os'].lower() + '.' + grains['id'] + '.com') }}
+    ServerName {{ servername }}
+    ServerAlias {{ serveralias }}
     ServerAdmin webmaster@localhost
     DocumentRoot {{ ('/var/www/html/' + grains['id'] + '/') }}
     ErrorLog ${APACHE_LOG_DIR}/error.log
@@ -49,6 +49,9 @@ SAMPLE_HTML
 
 tee /srv/salt/apache/init.sls <<APACHE_DATA
 
+{% set servername = grains['os'].lower() + '.' + grains['id'] + '.com' %}
+{% set serveralias = 'www.' + grains['os'].lower() + '.' + grains['id'] + '.com' %}
+
 apache_install:
   pkg.installed:
     - pkgs:
@@ -63,6 +66,9 @@ sample_page_conf:
     - user: root
     - group: root
     - template: jinja
+    - context:
+      servername: {{ servername }}
+      serveralias: {{ serveralias }}
     - require:
       - pkg: apache_install
 
@@ -87,7 +93,7 @@ sample_page_content:
 add_vhost_domain:
   file.append:
     - name: /etc/hosts
-    - text: 127.0.0.1 {{ grains['os'].lower() }}.{{ grains['id'] }}.com
+    - text: 127.0.0.1 {{ servername }}
     - require:
       - file: sample_page_content
       
@@ -100,7 +106,7 @@ restart_httpd:
 
 test_page:
   cmd.run:
-    - name: 'curl {{ grains['os'].lower() }}.{{ grains['id'] }}.com'
+    - name: 'curl -s {{ servername }}'
     - require:
       - service: restart_httpd