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

Proposed by Jacek Nykis
Status: Merged
Approved by: David Lawson
Approved revision: no longer in the source branch.
Merged at revision: 123
Proposed branch: lp:~jacekn/mojo/mojo-specs
Merge into: lp:mojo/mojo-specs
Diff against target: 35 lines (+10/-2)
3 files modified
charm-testing/squid-reverseproxy/collect (+2/-2)
charm-testing/squid-reverseproxy/deploy (+2/-0)
charm-testing/squid-reverseproxy/vhost-http.template (+6/-0)
To merge this branch: bzr merge lp:~jacekn/mojo/mojo-specs
Reviewer Review Type Date Requested Status
Mojo Maintainers Pending
Review via email: mp+352818@code.launchpad.net

Commit message

Update/fix squid-reverseproxy charm testing stage

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

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

lp:~jacekn/mojo/mojo-specs updated
123. By Jacek Nykis

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>

Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 123

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-testing/squid-reverseproxy/collect'
2--- charm-testing/squid-reverseproxy/collect 2018-04-20 12:06:36 +0000
3+++ charm-testing/squid-reverseproxy/collect 2018-08-09 14:39:14 +0000
4@@ -1,5 +1,5 @@
5-squid-reverseproxy lp:~canonical-sysadmins/canonical-is-charms/squid-reverseproxy
6-nrpe cs:{{ series }}/nrpe
7+squid-reverseproxy cs:squid-reverseproxy
8+nrpe cs:nrpe
9 apache2 cs:apache2
10
11 squid-reverseproxy/exec.d @
12
13=== modified file 'charm-testing/squid-reverseproxy/deploy'
14--- charm-testing/squid-reverseproxy/deploy 2018-07-16 12:27:28 +0000
15+++ charm-testing/squid-reverseproxy/deploy 2018-08-09 14:39:14 +0000
16@@ -8,6 +8,8 @@
17 cache_dir: /var/spool/squid
18 apache2:
19 charm: apache2
20+ options:
21+ vhost_http_template: "include-base64://{{spec_dir}}/{{stage}}/vhost-http.template"
22 nrpe:
23 charm: nrpe
24 {%- if series != "trusty" %}
25
26=== added file 'charm-testing/squid-reverseproxy/vhost-http.template'
27--- charm-testing/squid-reverseproxy/vhost-http.template 1970-01-01 00:00:00 +0000
28+++ charm-testing/squid-reverseproxy/vhost-http.template 2018-08-09 14:39:14 +0000
29@@ -0,0 +1,6 @@
30+<VirtualHost *:80>
31+ ServerAdmin webmaster@localhost
32+ DocumentRoot /var/www/html
33+ ErrorLog ${APACHE_LOG_DIR}/error.log
34+ CustomLog ${APACHE_LOG_DIR}/access.log combined
35+</VirtualHost>

Subscribers

People subscribed via source and target branches

to all changes: