From 0eda7953bda69f8cc197323c677572d3b59f7102 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Tue, 18 Dec 2012 21:05:14 +0000 Subject: [PATCH] apache conf and add apache to make jenkins behave --- files/jenkins/master/jenkins-apache.conf | 9 +++++++++ playbooks/groups/jenkins-cloud.yml | 11 +++++++++++ 2 files changed, 20 insertions(+) create mode 100644 files/jenkins/master/jenkins-apache.conf diff --git a/files/jenkins/master/jenkins-apache.conf b/files/jenkins/master/jenkins-apache.conf new file mode 100644 index 0000000000..a3515d49b2 --- /dev/null +++ b/files/jenkins/master/jenkins-apache.conf @@ -0,0 +1,9 @@ +ProxyPass / http://localhost:8080/ +ProxyPassReverse / http://localhost:8080/ +ProxyRequests Off + +# Local reverse proxy authorization override + + Order deny,allow + Allow from all + \ No newline at end of file diff --git a/playbooks/groups/jenkins-cloud.yml b/playbooks/groups/jenkins-cloud.yml index 5b00bbbf6e..9b0767becd 100644 --- a/playbooks/groups/jenkins-cloud.yml +++ b/playbooks/groups/jenkins-cloud.yml @@ -37,9 +37,20 @@ - dejavu-s\* - fontconfig - java-1.6.0-openjdk + - httpd tags: - packages + - name: add jenkins proxy config file for apache + action: copy src=$files/jenkins/master/jenkins-apache.conf dest=/etc/httpd/conf.d/jenkins-apache.conf owner=root group=root mode=0644 + notify: + - restart httpd + tags: + - config + + - name: enable apache + action: service name=httpd state=running enabled=true + - name: add jenkins upstream repo action: copy src=$files/jenkins/master/jenkins.repo dest=/etc/yum.repos.d/jenkins.repo owner=root group=root tags: