refactor delete-job-template.service-test, integrate jobTemplate.copy, resolves #1105 & #1047, tracking #1176

This commit is contained in:
Leigh Johnson
2016-03-11 14:41:05 -05:00
parent 92f8885946
commit e34aebcd93
15 changed files with 174 additions and 212 deletions

View File

@@ -1,17 +1,12 @@
Alias /munin /var/cache/munin/www
<Directory /var/cache/munin/www>
Alias /munin /var/www/html/munin/
<Directory /var/www/html/munin/>
Order Allow,Deny
Allow from all
Options FollowSymLinks
AuthUserFile /var/lib/awx/.munin_htpasswd
AuthName "Munin"
AuthType Basic
require valid-user
<IfModule mod_expires.c>
ExpiresActive On
ExpiresDefault M310
</IfModule>
</Directory>
ScriptAlias /munin-cgi/munin-cgi-graph /var/www/cgi-bin/munin-cgi-graph