diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2014-05-06 18:11:16 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2014-05-06 18:11:16 +0300 |
| commit | df1d700789f72560f90282a10f99ab51424e90a8 (patch) | |
| tree | f8a6dbe333e358f28f9520b0fa5ba374bd018625 | |
| parent | d96379539194fed0f16a20e8e6a416158f8b940b (diff) | |
ansible: Move system-level Jenkins config to jenkins-pkgs.yml
Because it affects system-level config files shipped in packages.
Change-Id: I1e94f8838cd98e36b36c60d5ff256b2cfd0d449a
| -rw-r--r-- | ansible/roles/jenkins/tasks/jenkins-cfg.yml | 12 | ||||
| -rw-r--r-- | ansible/roles/jenkins/tasks/jenkins-pkgs.yml | 14 |
2 files changed, 14 insertions, 12 deletions
diff --git a/ansible/roles/jenkins/tasks/jenkins-cfg.yml b/ansible/roles/jenkins/tasks/jenkins-cfg.yml index d040560..baee182 100644 --- a/ansible/roles/jenkins/tasks/jenkins-cfg.yml +++ b/ansible/roles/jenkins/tasks/jenkins-cfg.yml @@ -1,15 +1,3 @@ -- name: Configure Jenkins port - lineinfile: regexp="^HTTP_PORT=" line="HTTP_PORT=9090" dest=/etc/default/jenkins backup=yes - sudo: yes - when: jenkins_port != 8080 -- name: Configure Jenkins URL prefix - # Add --prefix= arg to existing args if not there yet - lineinfile: regexp='^JENKINS_ARGS=(?!.*--prefix=/jenkins)"?(.+?)"?$' - line='JENKINS_ARGS="\1 --prefix=/jenkins"' - dest=/etc/default/jenkins backrefs=yes - sudo: yes - when: jenkins_prefix != "/" - #- name: Set up minimal Jenkins configuration skeleton # # This requires recursive copy patch # copy: backup=yes src=jenkins-config/ dest=/var/lib/jenkins/ owner=jenkins diff --git a/ansible/roles/jenkins/tasks/jenkins-pkgs.yml b/ansible/roles/jenkins/tasks/jenkins-pkgs.yml index 1c647f7..f67f565 100644 --- a/ansible/roles/jenkins/tasks/jenkins-pkgs.yml +++ b/ansible/roles/jenkins/tasks/jenkins-pkgs.yml @@ -25,3 +25,17 @@ tags: - pkg - jenkins-install + +# System-level Jenkins configuration +- name: Configure Jenkins port + lineinfile: regexp="^HTTP_PORT=" line="HTTP_PORT=9090" dest=/etc/default/jenkins backup=yes + sudo: yes + when: jenkins_port != 8080 + +- name: Configure Jenkins URL prefix + # Add --prefix= arg to existing args if not there yet + lineinfile: regexp='^JENKINS_ARGS=(?!.*--prefix=/jenkins)"?(.+?)"?$' + line='JENKINS_ARGS="\1 --prefix=/jenkins"' + dest=/etc/default/jenkins backrefs=yes + sudo: yes + when: jenkins_prefix != "/" |