Skip to content
This repository was archived by the owner on Jul 17, 2018. It is now read-only.

Commit 2f7a1d2

Browse files
author
Darren Jones
authored
Merge pull request #175 from dazjones/jenkins-prestart
added jenkins config to prestart
2 parents 7b92d36 + 944a70b commit 2f7a1d2

File tree

6 files changed

+103
-27
lines changed

6 files changed

+103
-27
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ releases/**/*.tgz
1313
*#
1414
#*
1515
tmp
16+
import.yml

‎ci/manifests/jenkins.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ instance_groups:
88
release: devtools
99
properties:
1010
jenkins:
11+
config: config.xml
1112
admin:
1213
email: admin@localhost
1314
password: ((jenkins_admin_password))

‎jobs/jenkins-master/spec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ templates:
1616
bin/monit_debugger: bin/monit_debugger
1717
bin/post-restore-unlock.sh.erb: bin/bbr/post-restore-unlock
1818
bin/pre-restore-lock.sh.erb: bin/bbr/pre-restore-lock
19-
bin/pre-start: bin/pre-start
19+
bin/pre-start.erb: bin/pre-start
2020
bin/restore.sh.erb: bin/bbr/restore
2121
config/branding.css.erb: config/branding.css
2222
config/config.xml.erb: config/config.xml
23+
config/config-oauth.xml.erb: config/config-oauth.xml
2324
config/configure-access.groovy.erb: init.groovy.d/configure-access.groovy
2425
config/configure-master-access-control.groovy.erb: init.groovy.d/configure-master-access-control.groovy
2526
config/configure-maven.groovy.erb: init.groovy.d/configure-maven.groovy

jobs/jenkins-master/templates/bin/pre-start renamed to jobs/jenkins-master/templates/bin/pre-start.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ mkdir -p /var/vcap/store/jenkins-master
77
mkdir -p /var/vcap/store/jenkins-master/init.groovy.d
88
mkdir -p /var/vcap/store/jenkins-master/plugins
99

10+
JENKINS_CONFIG="<% p('jenkins.config') %>"
11+
1012
if [[ $(ls /var/vcap/jobs/jenkins-master/config/*.xml) ]]; then
1113
echo "Copying Config..."
1214
cp /var/vcap/jobs/jenkins-master/config/*.xml /var/vcap/store/jenkins-master
15+
cp /var/vcap/jobs/jenkins-master/config/${JENKINS_CONFIG} /var/vcap/store/jenkins-master/config.xml
1316
fi
1417

1518
if [[ $(ls /var/vcap/jobs/jenkins-master/init.groovy.d/*.groovy) ]]; then

‎jobs/jenkins-master/templates/config/config-oauth.xml.erb‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<hudson>
3+
<disabledAdministrativeMonitors>
4+
<string>hudson.diagnosis.ReverseProxySetupMonitor</string>
5+
</disabledAdministrativeMonitors>
6+
<version>1.617</version>
7+
<numExecutors>0</numExecutors>
8+
<mode>NORMAL</mode>
9+
<useSecurity>true</useSecurity>
10+
<authorizationStrategy class="org.jenkinsci.plugins.GithubAuthorizationStrategy" plugin="[email protected]">
11+
<rootACL>
12+
<organizationNameList class="linked-list">
13+
<string><%= p('jenkins.github.oauth.org_name') %></string>
14+
</organizationNameList>
15+
<adminUserNameList class="linked-list">
16+
<string><%= p('jenkins.github.oauth.admins.admin1') %></string>
17+
<string><%= p('jenkins.github.oauth.admins.admin2') %></string>
18+
<string><%= p('jenkins.github.oauth.admins.admin3') %></string>
19+
</adminUserNameList>
20+
<authenticatedUserReadPermission>false</authenticatedUserReadPermission>
21+
<useRepositoryPermissions>false</useRepositoryPermissions>
22+
<authenticatedUserCreateJobPermission>false</authenticatedUserCreateJobPermission>
23+
<allowGithubWebHookPermission>false</allowGithubWebHookPermission>
24+
<allowCcTrayPermission>false</allowCcTrayPermission>
25+
<allowAnonymousReadPermission>false</allowAnonymousReadPermission>
26+
<allowAnonymousJobStatusPermission>false</allowAnonymousJobStatusPermission>
27+
</rootACL>
28+
</authorizationStrategy>
29+
<securityRealm class="org.jenkinsci.plugins.GithubSecurityRealm">
30+
<githubWebUri><%= p('jenkins.github.oauth.url.web') %></githubWebUri>
31+
<githubApiUri><%= p('jenkins.github.oauth.url.api') %></githubApiUri>
32+
<clientID><%= p('jenkins.github.oauth.client.id') %></clientID>
33+
<clientSecret><%= p('jenkins.github.oauth.client.secret') %></clientSecret>
34+
<oauthScopes>read:org,user:email</oauthScopes>
35+
</securityRealm>
36+
<disableRememberMe>true</disableRememberMe>
37+
<projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
38+
<workspaceDir>${ITEM_ROOTDIR}/workspace</workspaceDir>
39+
<buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
40+
<markupFormatter class="hudson.markup.RawHtmlMarkupFormatter" plugin="[email protected]">
41+
<disableSyntaxHighlighting>false</disableSyntaxHighlighting>
42+
</markupFormatter>
43+
<jdks />
44+
<viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
45+
<myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
46+
<clouds/>
47+
<quietPeriod>5</quietPeriod>
48+
<scmCheckoutRetryCount>0</scmCheckoutRetryCount>
49+
<views>
50+
<hudson.model.AllView>
51+
<owner class="hudson" reference="../../.."/>
52+
<name>All</name>
53+
<filterExecutors>false</filterExecutors>
54+
<filterQueue>false</filterQueue>
55+
<properties class="hudson.model.View$PropertyList"/>
56+
</hudson.model.AllView>
57+
<listView>
58+
<owner class="hudson" reference="../../.."/>
59+
<name>Failed Jobs</name>
60+
<filterExecutors>false</filterExecutors>
61+
<filterQueue>false</filterQueue>
62+
<properties class="hudson.model.View$PropertyList"/>
63+
<jobNames>
64+
<comparator class="hudson.util.CaseInsensitiveComparator"/>
65+
</jobNames>
66+
<jobFilters>
67+
<hudson.views.JobStatusFilter plugin="[email protected]">
68+
<includeExcludeTypeString>includeMatched</includeExcludeTypeString>
69+
<unstable>true</unstable>
70+
<failed>true</failed>
71+
<aborted>false</aborted>
72+
<disabled>false</disabled>
73+
<stable>false</stable>
74+
</hudson.views.JobStatusFilter>
75+
</jobFilters>
76+
<columns>
77+
<hudson.views.StatusColumn/>
78+
<hudson.views.WeatherColumn/>
79+
<hudson.views.JobColumn/>
80+
<hudson.views.LastSuccessColumn/>
81+
<hudson.views.LastFailureColumn/>
82+
<hudson.views.LastDurationColumn/>
83+
<hudson.views.BuildButtonColumn/>
84+
</columns>
85+
<recurse>false</recurse>
86+
</listView>
87+
</views>
88+
<primaryView>All</primaryView>
89+
<slaveAgentPort>50000</slaveAgentPort>
90+
<label></label>
91+
<crumbIssuer class="hudson.security.csrf.DefaultCrumbIssuer">
92+
<excludeClientIPFromCrumb>false</excludeClientIPFromCrumb>
93+
</crumbIssuer>
94+
<nodeProperties/>
95+
<globalNodeProperties/>
96+
</hudson>

‎jobs/jenkins-master/templates/config/config.xml.erb‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,6 @@
77
<numExecutors>0</numExecutors>
88
<mode>NORMAL</mode>
99
<useSecurity>true</useSecurity>
10-
<authorizationStrategy class="org.jenkinsci.plugins.GithubAuthorizationStrategy" plugin="[email protected]">
11-
<rootACL>
12-
<organizationNameList class="linked-list">
13-
<string><%= p('jenkins.github.oauth.org_name') %></string>
14-
</organizationNameList>
15-
<adminUserNameList class="linked-list">
16-
<string><%= p('jenkins.github.oauth.admins.admin1') %></string>
17-
<string><%= p('jenkins.github.oauth.admins.admin2') %></string>
18-
<string><%= p('jenkins.github.oauth.admins.admin3') %></string>
19-
</adminUserNameList>
20-
<authenticatedUserReadPermission>false</authenticatedUserReadPermission>
21-
<useRepositoryPermissions>false</useRepositoryPermissions>
22-
<authenticatedUserCreateJobPermission>false</authenticatedUserCreateJobPermission>
23-
<allowGithubWebHookPermission>false</allowGithubWebHookPermission>
24-
<allowCcTrayPermission>false</allowCcTrayPermission>
25-
<allowAnonymousReadPermission>false</allowAnonymousReadPermission>
26-
<allowAnonymousJobStatusPermission>false</allowAnonymousJobStatusPermission>
27-
</rootACL>
28-
</authorizationStrategy>
29-
<securityRealm class="org.jenkinsci.plugins.GithubSecurityRealm">
30-
<githubWebUri><%= p('jenkins.github.oauth.url.web') %></githubWebUri>
31-
<githubApiUri><%= p('jenkins.github.oauth.url.api') %></githubApiUri>
32-
<clientID><%= p('jenkins.github.oauth.client.id') %></clientID>
33-
<clientSecret><%= p('jenkins.github.oauth.client.secret') %></clientSecret>
34-
<oauthScopes>read:org,user:email</oauthScopes>
35-
</securityRealm>
3610
<disableRememberMe>true</disableRememberMe>
3711
<projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
3812
<workspaceDir>${ITEM_ROOTDIR}/workspace</workspaceDir>

0 commit comments

Comments
 (0)