Skip to content

Commit 35ddc1f

Browse files
andreaswittigandreaswittig
authored
Fixing Jenkins examples (#32)
1 parent e8131b2 commit 35ddc1f

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

‎chapter13/multiaz-efs-eip.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ Resources:
222222
# Installing Jenkins
223223
amazon-linux-extras enable epel=7.11 && yum -y clean metadata
224224
yum install -y epel-release && yum -y clean metadata
225-
yum install -y java-11-amazon-corretto-headless daemonize amazon-efs-utils
226-
wget -q -T 60 http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.375.1-1.1.noarch.rpm
227-
rpm --install jenkins-2.375.1-1.1.noarch.rpm
225+
yum install -y java-17-amazon-corretto-headless daemonize amazon-efs-utils
226+
wget -q -T 60 http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.479.2-1.1.noarch.rpm
227+
rpm --install jenkins-2.479.2-1.1.noarch.rpm
228228

229229
# Mounting EFS volume
230230
mkdir -p /var/lib/jenkins
@@ -234,7 +234,7 @@ Resources:
234234
chown -R jenkins:jenkins /var/lib/jenkins
235235

236236
# Configuring Jenkins
237-
sed -i -e 's/JENKINS_ARGS=""/JENKINS_ARGS="--argumentsRealm.passwd.admin=${JenkinsAdminPassword} --argumentsRealm.roles.admin=admin"/g' /etc/sysconfig/jenkins
237+
sed -i -e 's/#Environment="JENKINS_OPTS="/Environment="JENKINS_OPTS=--argumentsRealm.passwd.admin=${JenkinsAdminPassword} --argumentsRealm.roles.admin=admin"/g' /usr/lib/systemd/system/jenkins.service
238238
if [ ! -f /var/lib/jenkins/config.xml ]; then
239239
echo '<?xml version="1.0" encoding="UTF-8"?><hudson><version>1.0</version><useSecurity>true</useSecurity><authorizationStrategy class="hudson.security.FullControlOnceLoggedInAuthorizationStrategy"/><securityRealm class="hudson.security.LegacySecurityRealm"/></hudson>' > /var/lib/jenkins/config.xml
240240
chown jenkins:jenkins /var/lib/jenkins/config.xml

‎chapter13/multiaz-efs.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,9 @@ Resources:
205205
# Installing Jenkins
206206
amazon-linux-extras enable epel=7.11 && yum -y clean metadata
207207
yum install -y epel-release && yum -y clean metadata
208-
yum install -y java-11-amazon-corretto-headless daemonize amazon-efs-utils
209-
wget -q -T 60 http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.375.1-1.1.noarch.rpm
210-
rpm --install jenkins-2.375.1-1.1.noarch.rpm
208+
yum install -y java-17-amazon-corretto-headless daemonize amazon-efs-utils
209+
wget -q -T 60 http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.479.2-1.1.noarch.rpm
210+
rpm --install jenkins-2.479.2-1.1.noarch.rpm
211211

212212
# Mounting EFS volume
213213
mkdir -p /var/lib/jenkins
@@ -217,7 +217,7 @@ Resources:
217217
chown -R jenkins:jenkins /var/lib/jenkins
218218

219219
# Configuring Jenkins
220-
sed -i -e 's/JENKINS_ARGS=""/JENKINS_ARGS="--argumentsRealm.passwd.admin=${JenkinsAdminPassword} --argumentsRealm.roles.admin=admin"/g' /etc/sysconfig/jenkins
220+
sed -i -e 's/#Environment="JENKINS_OPTS="/Environment="JENKINS_OPTS=--argumentsRealm.passwd.admin=${JenkinsAdminPassword} --argumentsRealm.roles.admin=admin"/g' /usr/lib/systemd/system/jenkins.service
221221
if [ ! -f /var/lib/jenkins/config.xml ]; then
222222
echo '<?xml version="1.0" encoding="UTF-8"?><hudson><version>1.0</version><useSecurity>true</useSecurity><authorizationStrategy class="hudson.security.FullControlOnceLoggedInAuthorizationStrategy"/><securityRealm class="hudson.security.LegacySecurityRealm"/></hudson>' > /var/lib/jenkins/config.xml
223223
chown jenkins:jenkins /var/lib/jenkins/config.xml

‎chapter13/multiaz.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@ Resources:
173173
# Installing Jenkins
174174
amazon-linux-extras enable epel=7.11 && yum -y clean metadata
175175
yum install -y epel-release && yum -y clean metadata
176-
yum install -y java-11-amazon-corretto-headless daemonize
177-
wget -q -T 60 http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.375.1-1.1.noarch.rpm
178-
rpm --install jenkins-2.375.1-1.1.noarch.rpm
176+
yum install -y java-17-amazon-corretto-headless daemonize
177+
wget -q -T 60 http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.479.2-1.1.noarch.rpm
178+
rpm --install jenkins-2.479.2-1.1.noarch.rpm
179179

180180
# Configuring Jenkins
181-
sed -i -e 's/JENKINS_ARGS=""/JENKINS_ARGS="--argumentsRealm.passwd.admin=${JenkinsAdminPassword} --argumentsRealm.roles.admin=admin"/g' /etc/sysconfig/jenkins
181+
sed -i -e 's/#Environment="JENKINS_OPTS="/Environment="JENKINS_OPTS=--argumentsRealm.passwd.admin=${JenkinsAdminPassword} --argumentsRealm.roles.admin=admin"/g' /usr/lib/systemd/system/jenkins.service
182182
if [ ! -f /var/lib/jenkins/config.xml ]; then
183183
echo '<?xml version="1.0" encoding="UTF-8"?><hudson><version>1.0</version><useSecurity>true</useSecurity><authorizationStrategy class="hudson.security.FullControlOnceLoggedInAuthorizationStrategy"/><securityRealm class="hudson.security.LegacySecurityRealm"/></hudson>' > /var/lib/jenkins/config.xml
184184
chown jenkins:jenkins /var/lib/jenkins/config.xml

‎chapter13/recovery.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,12 @@ Resources:
166166
# Installing Jenkins
167167
amazon-linux-extras enable epel=7.11 && yum -y clean metadata
168168
yum install -y epel-release && yum -y clean metadata
169-
yum install -y java-11-amazon-corretto-headless daemonize
170-
wget -q -T 60 http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.375.1-1.1.noarch.rpm
171-
rpm --install jenkins-2.375.1-1.1.noarch.rpm
169+
yum install -y java-17-amazon-corretto-headless daemonize
170+
wget -q -T 60 http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.479.2-1.1.noarch.rpm
171+
rpm --install jenkins-2.479.2-1.1.noarch.rpm
172172

173173
# Configuring Jenkins
174-
sed -i -e 's/JENKINS_ARGS=""/JENKINS_ARGS="--argumentsRealm.passwd.admin=${JenkinsAdminPassword} --argumentsRealm.roles.admin=admin"/g' /etc/sysconfig/jenkins
174+
sed -i -e 's/#Environment="JENKINS_OPTS="/Environment="JENKINS_OPTS=--argumentsRealm.passwd.admin=${JenkinsAdminPassword} --argumentsRealm.roles.admin=admin"/g' /usr/lib/systemd/system/jenkins.service
175175
if [ ! -f /var/lib/jenkins/config.xml ]; then
176176
echo '<?xml version="1.0" encoding="UTF-8"?><hudson><version>1.0</version><useSecurity>true</useSecurity><authorizationStrategy class="hudson.security.FullControlOnceLoggedInAuthorizationStrategy"/><securityRealm class="hudson.security.LegacySecurityRealm"/></hudson>' > /var/lib/jenkins/config.xml
177177
chown jenkins:jenkins /var/lib/jenkins/config.xml

0 commit comments

Comments
 (0)