opendev/system-config
Code Issues Proposed changes

Merge "Fix jquery setup on Gerrit server."

Browse Source
This commit is contained in:
Jenkins 2015-03-20 21:50:31 +00:00 committed by Gerrit Code Review
commit e0cb759acb
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/files/gerrit/GerritSiteHeader.html
View File

@ -1,5 +1,5 @@
<div>
<script type="text/javascript" src="static/jquery.min.js" />
<script type="text/javascript" src="static/jquery.js" />
<script type="text/javascript" src="static/hideci.js" />
<a href="/"><h1 style="color: #CF2F19"><img src="static/title.png" style="vertical-align:middle;" /></h1></a>
</div>

12
modules/openstack_project/manifests/gerrit.pp
View File

@ -273,11 +273,15 @@ class openstack_project::gerrit (
ensure => present,
}
file { '/home/gerrit2/review_site/static/jquery.min.js':
file { '/home/gerrit2/review_site/static/jquery.js':
ensure => present,
source => '/usr/share/javascript/jquery/jquery.min.js',
require => [Class['::gerrit'],
Package['libjs-jquery']],
source => '/usr/share/javascript/jquery/jquery.js',
require => [
File['/home/gerrit2/review_site/static'],
Class['::gerrit'],
Package['libjs-jquery'],
],
subscribe => Package['libjs-jquery'],
notify => Exec['reload_gerrit_header'],
}