diff --git a/all.yaml b/all.yaml index 3f61eb7..a412deb 100644 --- a/all.yaml +++ b/all.yaml @@ -5,7 +5,7 @@ vars: tmpl: - { file: "101-syncthing", value: 'Use ProxyHost "syncthing.rudolf" "/" "http://localhost:{{ syncthing_port }}/" "syncthing.rudolf"' } - - { file: "102-jenkins", value: 'Use ProxyHost "jenkins.rudolf" "/" "http://localhost:{{ jenkins_port }}/" "jenkins.rudolf"' } + - { file: "102-jenkins", value: 'Use ProxyHost "jenkins.rudolf" "/" "http://192.168.17.2:{{ jenkins_port }}/" "jenkins.rudolf"' } - { file: "torrent", value: 'Use ProxyHost "torrent.rudolf" "/transmission" "http://192.168.17.2:9091/transmission" "torrent.rudolf"' } # - {file: "static", value: 'Use DocRootVHost "static.rudolf" "/home/www/static"' } # - {file: "", value: '# TODO Header edit Location ^http://jenkins.rudolf.com.ua https://jenkins.rudolf.com.ua' } @@ -29,5 +29,6 @@ become: yes roles: - { role: gogs } + - { role: jenkins } diff --git a/jenkins.yaml b/jenkins.yaml deleted file mode 100644 index 92f0e0b..0000000 --- a/jenkins.yaml +++ /dev/null @@ -1,91 +0,0 @@ ---- -- hosts: serva4og - vars: - user: rudolf - - plugins: - - git - - git-parameter - - email-ext - - deploy - - cobertura - - parameterized-trigger - - conditional-buildstep - - envinject - - python - - tasks: - - - name: install packages - apt: name={{ item }} update_cache=yes state=latest - with_items: - - docker.io - - python-docker - - default-jdk - become: yes - - - name: user {{ user }} - user: - name: "{{ user }}" - groups: docker - append: yes - - - name: jenkins home present - file: - path: /var/jenkins - state: directory - mode: 755 - - - name: copy configs - copy: - src: jenkins - dest: /var - force: yes - owner: "{{ user }}" - group: "{{ user }}" - notify: restart jenkins docker - become: yes - - # - name: my jenkins docker - # command: docker build -t rudolf/jenkins /var/jenkins/docker - # poll: 1000 - - - name: run jenkins docker - docker: - name: jenkins - image: jenkins - detach: True - net: default - restart_policy: always - volumes: - - "/var/jenkins:/var/jenkins_home" - # - "/var/run/docker.sock:/var/run/docker.sock" - # - "/usr/bin/docker:/usr/bin/docker" - ports: - - "0.0.0.0:{{ jenkins_port }}:8080" - - "0.0.0.0:{{ jenkins_cli }}:50000" - state: reloaded - register: docker_restarted - - - name: wait jenkins - pause: - seconds: 20 - when: docker_restarted - - - name: read installed plugins - shell: "java -jar /var/jenkins/war/WEB-INF/jenkins-cli.jar -s http://localhost:{{ jenkins_port }}/ list-plugins" - register: list_plugins - - - name: install jenkins plugins - shell: "java -jar /var/jenkins/war/WEB-INF/jenkins-cli.jar -s http://localhost:{{ jenkins_port }}/ install-plugin {{ item }}" - with_items: "{{ plugins | difference(list_plugins.stdout_lines|map('split')|map('first')|list) }}" - notify: restart jenkins docker - - handlers: - - name: restart jenkins docker - docker_container: - name: jenkins - image: jenkins - restart_policy: always - restart: yes - diff --git a/roles/docker/tasks/main.yaml b/roles/docker/tasks/main.yaml new file mode 100644 index 0000000..be43edd --- /dev/null +++ b/roles/docker/tasks/main.yaml @@ -0,0 +1,11 @@ +- name: install packages + apt: name={{ item }} update_cache=yes state=latest + with_items: + - docker.io + - python-docker + +- name: user {{ ansible_ssh_user }} + user: + name: "{{ ansible_ssh_user }}" + groups: docker + append: yes diff --git a/roles/gogs/meta/main.yml b/roles/gogs/meta/main.yml index a1f3324..156821c 100644 --- a/roles/gogs/meta/main.yml +++ b/roles/gogs/meta/main.yml @@ -9,5 +9,7 @@ galaxy_info: galaxy_tags: [] -dependencies: [] +dependencies: + - { role: docker } + diff --git a/roles/gogs/tasks/main.yaml b/roles/gogs/tasks/main.yaml index cead02b..d5d4347 100644 --- a/roles/gogs/tasks/main.yaml +++ b/roles/gogs/tasks/main.yaml @@ -1,16 +1,4 @@ -- name: install packages - apt: name={{ item }} update_cache=yes state=latest - with_items: - - docker.io - - python-docker - -- name: user {{ ansible_ssh_user }} - user: - name: "{{ ansible_ssh_user }}" - groups: docker - append: yes - -- name: run gogs docker +- name: run gogs docker container docker: name: gogs image: gogs/gogs @@ -21,7 +9,6 @@ - "/var/gogs:/data" ports: - "0.0.0.0:{{ gogs_port }}:3000" -# - "0.0.0.0:{{ gogs_ssh }}:22" state: reloaded diff --git a/roles/jdk/tasks/main.yaml b/roles/jdk/tasks/main.yaml new file mode 100644 index 0000000..3de482d --- /dev/null +++ b/roles/jdk/tasks/main.yaml @@ -0,0 +1,5 @@ +- name: install jdk + apt: name={{ item }} update_cache=yes state=latest + with_items: + - default-jdk + become: yes diff --git a/roles/jenkins/handlers/main.yml b/roles/jenkins/handlers/main.yml new file mode 100644 index 0000000..a9399ba --- /dev/null +++ b/roles/jenkins/handlers/main.yml @@ -0,0 +1,7 @@ +- name: restart jenkins docker + docker_container: + name: jenkins + image: jenkins + restart_policy: always + restart: yes + diff --git a/roles/jenkins/meta/main.yml b/roles/jenkins/meta/main.yml new file mode 100644 index 0000000..65c0ab6 --- /dev/null +++ b/roles/jenkins/meta/main.yml @@ -0,0 +1,16 @@ +galaxy_info: + author: your name + description: your description + company: your company (optional) + + license: license (GPLv2, CC-BY, etc) + + min_ansible_version: 1.2 + + galaxy_tags: [] + +dependencies: + - { role: docker } + - { role: jdk } + + diff --git a/roles/jenkins/tasks/main.yaml b/roles/jenkins/tasks/main.yaml new file mode 100644 index 0000000..2ccef73 --- /dev/null +++ b/roles/jenkins/tasks/main.yaml @@ -0,0 +1,46 @@ +- name: jenkins home present + file: + path: /var/jenkins + state: directory + mode: 755 + +#- name: copy configs +# copy: +# src: jenkins +# dest: /var +# force: yes +# owner: "{{ user }}" +# group: "{{ user }}" +# notify: restart jenkins docker +# become: yes + +- name: run jenkins docker + docker: + name: jenkins + image: jenkins + detach: True + net: default + restart_policy: always + volumes: + - "/var/jenkins:/var/jenkins_home" + # - "/var/run/docker.sock:/var/run/docker.sock" + # - "/usr/bin/docker:/usr/bin/docker" + ports: + - "0.0.0.0:{{ jenkins_port }}:8080" + - "0.0.0.0:{{ jenkins_cli }}:50000" + state: reloaded + register: docker_restarted + +- name: wait jenkins + pause: + seconds: 20 + when: docker_restarted.changed + +#- name: read installed plugins +# shell: "java -jar /var/jenkins/war/WEB-INF/jenkins-cli.jar -s http://localhost:{{ jenkins_port }}/ list-plugins" +# register: list_plugins +# +#- name: install jenkins plugins +# shell: "java -jar /var/jenkins/war/WEB-INF/jenkins-cli.jar -s http://localhost:{{ jenkins_port }}/ install-plugin {{ item }}" +# with_items: "{{ plugins | difference(list_plugins.stdout_lines|map('split')|map('first')|list) }}" +# notify: restart jenkins docker diff --git a/roles/jenkins/vars/main.yml b/roles/jenkins/vars/main.yml new file mode 100644 index 0000000..2701b22 --- /dev/null +++ b/roles/jenkins/vars/main.yml @@ -0,0 +1,10 @@ +plugins: +- git +- git-parameter +- email-ext +- deploy +- cobertura +- parameterized-trigger +- conditional-buildstep +- envinject +- python \ No newline at end of file diff --git a/roles/letsencrypt/tasks/main.yml b/roles/letsencrypt/tasks/main.yml index 043c76c..9dae874 100644 --- a/roles/letsencrypt/tasks/main.yml +++ b/roles/letsencrypt/tasks/main.yml @@ -27,24 +27,6 @@ tags: - letsencrypt -- name: Debug - debug: - var: opensslOut - tags: - - letsencrypt - -- name: Debug - debug: - var: letsencryptRenewRequired - tags: - - letsencrypt - -- name: Debug - debug: - var: letsencryptNewCertRequired - tags: - - letsencrypt - - name: apache stopped service: name: apache2