Configurable jenkins nginx port

5e240c60 · E. Kolpakov · d4678945 · 5e240c60 · 5e240c60
Commit 5e240c60 authored Apr 22, 2016 by E. Kolpakov
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

playbooks/roles/jenkins_master/defaults/main.yml
+1 -0

playbooks/roles/jenkins_master/templates/etc/nginx/sites-available/jenkins.j2
+1 -1

No files found.
--- a/playbooks/roles/jenkins_master/defaults/main.yml
+++ b/playbooks/roles/jenkins_master/defaults/main.yml
@@ -3,6 +3,7 @@ jenkins_user: "jenkins"
 jenkins_group: "edx"
 jenkins_server_name: "jenkins.testeng.edx.org"
 jenkins_port: 8080
+jenkins_nginx_port: 80

 jenkins_version: "1.638"
 jenkins_deb_url: "http://pkg.jenkins-ci.org/debian/binary/jenkins_{{ jenkins_version }}_all.deb"

--- a/playbooks/roles/jenkins_master/templates/etc/nginx/sites-available/jenkins.j2
+++ b/playbooks/roles/jenkins_master/templates/etc/nginx/sites-available/jenkins.j2
 server {
-  listen 80;
+  listen {{ jenkins_nginx_port }};
  server_name {{ jenkins_server_name }};

  location / {