Merge lp:~jacekn/mojo/mojo-specs into lp:mojo/mojo-specs

[Jacek Nykis]

Update/fix squid-reverseproxy charm testing stage

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[lp:~jacekn/mojo/mojo-specs]

123. By Jacek Nykis on 2018-08-09

Update/fix squid-reverseproxy charm testing stage

Reviewed-on: https://code.launchpad.net/~jacekn/mojo/mojo-specs/+merge/352818
Reviewed-by: David Lawson <email address hidden>

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 123

=== modified file 'charm-testing/squid-reverseproxy/collect'
--- charm-testing/squid-reverseproxy/collect	2018-04-20 12:06:36 +0000
+++ charm-testing/squid-reverseproxy/collect	2018-08-09 14:39:14 +0000
@@ -1,5 +1,5 @@
-squid-reverseproxy                      lp:~canonical-sysadmins/canonical-is-charms/squid-reverseproxy
-nrpe                                    cs:{{ series }}/nrpe
+squid-reverseproxy                      cs:squid-reverseproxy
+nrpe                                    cs:nrpe
 apache2                                 cs:apache2
 
 squid-reverseproxy/exec.d               @
 
=== modified file 'charm-testing/squid-reverseproxy/deploy'
--- charm-testing/squid-reverseproxy/deploy	2018-07-16 12:27:28 +0000
+++ charm-testing/squid-reverseproxy/deploy	2018-08-09 14:39:14 +0000
@@ -8,6 +8,8 @@
                 cache_dir: /var/spool/squid
         apache2:
             charm: apache2
+            options:
+                vhost_http_template: "include-base64://{{spec_dir}}/{{stage}}/vhost-http.template"
         nrpe:
             charm: nrpe
 {%- if series != "trusty" %}
 
=== added file 'charm-testing/squid-reverseproxy/vhost-http.template'
--- charm-testing/squid-reverseproxy/vhost-http.template	1970-01-01 00:00:00 +0000
+++ charm-testing/squid-reverseproxy/vhost-http.template	2018-08-09 14:39:14 +0000
@@ -0,0 +1,6 @@
+<VirtualHost *:80>
+        ServerAdmin webmaster@localhost
+        DocumentRoot /var/www/html
+        ErrorLog ${APACHE_LOG_DIR}/error.log
+        CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>