diff --git a/ansible.cfg b/ansible.cfg
index 2e596bf..2a45e07 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,3 +1,5 @@
[defaults]
hostfile = hosts
+filter_plugins = plugins/filter
+
diff --git a/hosts b/hosts
index 9c24ed3..5aaf51e 100644
--- a/hosts
+++ b/hosts
@@ -1,6 +1,6 @@
[debian]
-serva4og ansible_ssh_user=rudolf ansible_ssh_host=192.168.17.2
-pi ansible_ssh_user=pi ansible_ssh_host=192.168.17.3
+serva4og ansible_ssh_user=rudolf ansible_ssh_host=192.168.17.2
+pi ansible_ssh_user=pi ansible_ssh_host=192.168.17.3
[apache2]
-serva4og ansible_ssh_user=rudolf ansible_ssh_host=192.168.17.2
+serva4og ansible_ssh_user=rudolf ansible_ssh_host=192.168.17.2
diff --git a/jenkins.yaml b/jenkins.yaml
index d9790de..474c2f6 100644
--- a/jenkins.yaml
+++ b/jenkins.yaml
@@ -2,6 +2,17 @@
- hosts: serva4og
vars:
user: rudolf
+
+ plugins:
+ - git
+ - git-parameter
+ - email-ext
+ - deploy
+ - cobertura
+ - parameterized-trigger
+ - conditional-buildstep
+ - envinject
+
become: yes
tasks:
@@ -24,12 +35,12 @@
path: /var/jenkins
state: directory
mode: 755
-
+
- name: copy configs
copy:
- src: jenkins/jobs
- dest: /var/jenkins
- force: no
+ src: jenkins
+ dest: /var
+ force: yes
owner: "{{ user }}"
group: "{{ user }}"
notify: restart jenkins docker
@@ -48,13 +59,17 @@
- "0.0.0.0:{{ jenkins_cli }}:50000"
state: reloaded
- - name: install jenkins plugins
- shell: "java -jar /var/jenkins/war/WEB-INF/jenkins-cli.jar -s http://localhost:8080/ install-plugin {{ item }}"
- with_items:
- - git
-
+
+ - name: read installed plugins
+ shell: "java -jar /var/jenkins/war/WEB-INF/jenkins-cli.jar -s http://localhost:8080/ list-plugins"
+ register: list_plugins
become_user: rudolf
+ - name: install jenkins plugins
+ shell: "java -jar /var/jenkins/war/WEB-INF/jenkins-cli.jar -s http://localhost:8080/ install-plugin {{ item }}"
+ with_items: "{{ plugins | difference(list_plugins.stdout_lines|map('split')|map('first')|list) }}"
+ become_user: rudolf
+ notify: restart jenkins docker
handlers:
- name: restart jenkins docker
diff --git a/jenkins/hudson.plugins.git.GitSCM.xml b/jenkins/hudson.plugins.git.GitSCM.xml
new file mode 100644
index 0000000..bc13bf8
--- /dev/null
+++ b/jenkins/hudson.plugins.git.GitSCM.xml
@@ -0,0 +1,7 @@
+
+
+ 1
+ jenkins
+ jenkins@rudolf.com.ua
+ false
+
diff --git a/jenkins/hudson.tasks.Maven.xml b/jenkins/hudson.tasks.Maven.xml
new file mode 100644
index 0000000..e0e66b7
--- /dev/null
+++ b/jenkins/hudson.tasks.Maven.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ maven
+
+
+
+
+ 3.3.9
+
+
+
+
+
+
+
diff --git a/jenkins/jenkins.mvn.GlobalMavenConfig.xml b/jenkins/jenkins.mvn.GlobalMavenConfig.xml
new file mode 100644
index 0000000..d88c2dc
--- /dev/null
+++ b/jenkins/jenkins.mvn.GlobalMavenConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/jenkins/jobs/Deploy_tomcat/config.xml b/jenkins/jobs/Deploy_tomcat/config.xml
index 70a25a7..18197c2 100644
--- a/jenkins/jobs/Deploy_tomcat/config.xml
+++ b/jenkins/jobs/Deploy_tomcat/config.xml
@@ -83,7 +83,7 @@
rm -rf *
-cp /var/lib/jenkins/.m2/repository/$groupID/$artifactID/$version/$artifactID-$version.war $contextRoot.war
+cp ~/.m2/repository/$groupID/$artifactID/$version/$artifactID-$version.war $contextRoot.war
@@ -92,7 +92,7 @@ cp /var/lib/jenkins/.m2/repository/$groupID/$artifactID/$version/$artifactID-$ve
deployer
ZGVwbG95ZXI=
- http://localhost:8080/
+ http://192.168.17.2:8888/
diff --git a/jenkins/jobs/ExpEng/config.xml b/jenkins/jobs/ExpEng/config.xml
index 68c62fb..49d9898 100644
--- a/jenkins/jobs/ExpEng/config.xml
+++ b/jenkins/jobs/ExpEng/config.xml
@@ -38,7 +38,7 @@
origin
- git@rudolf.com.ua:expEng.git
+ ssh://git@rudolf.com.ua:23/rudolf/expEng.git
057bac74-b42d-46d3-9c6f-bb1c81491d93
diff --git a/jenkins/jobs/Finance/config.xml b/jenkins/jobs/Finance/config.xml
index d796132..f2030ef 100644
--- a/jenkins/jobs/Finance/config.xml
+++ b/jenkins/jobs/Finance/config.xml
@@ -43,7 +43,7 @@
origin
- git@rudolf.com.ua:finance.git
+ ssh://git@rudolf.com.ua:23/rudolf/finance.git
057bac74-b42d-46d3-9c6f-bb1c81491d93
diff --git a/jenkins/jobs/smarthome/config.xml b/jenkins/jobs/smarthome/config.xml
index 1dc21c2..2206698 100644
--- a/jenkins/jobs/smarthome/config.xml
+++ b/jenkins/jobs/smarthome/config.xml
@@ -42,7 +42,7 @@
origin
- git@rudolf.com.ua:avr.git
+ ssh://git@rudolf.com.ua:23/rudolf/avr.git
057bac74-b42d-46d3-9c6f-bb1c81491d93
diff --git a/jenkins/jobs/smarthome_master/config.xml b/jenkins/jobs/smarthome_master/config.xml
index 9cf9cd8..6db13a7 100644
--- a/jenkins/jobs/smarthome_master/config.xml
+++ b/jenkins/jobs/smarthome_master/config.xml
@@ -8,7 +8,7 @@
2
- git@rudolf.com.ua:avr.git
+ ssh://git@rudolf.com.ua:23/rudolf/avr.git
057bac74-b42d-46d3-9c6f-bb1c81491d93
diff --git a/plugins/filter/split.py b/plugins/filter/split.py
new file mode 100644
index 0000000..9e75f63
--- /dev/null
+++ b/plugins/filter/split.py
@@ -0,0 +1,23 @@
+from ansible import errors
+import re
+
+def split_string(string, separator=' '):
+ try:
+ return string.split(separator)
+ except Exception, e:
+ raise errors.AnsibleFilterError('split plugin error: %s, provided string: "%s"' % (str(e),str(string)) )
+
+def split_regex(string, separator_pattern='\s+'):
+ try:
+ return re.split(separator_pattern, string)
+ except Exception, e:
+ raise errors.AnsibleFilterError('split plugin error: %s, provided string: "%s"' % (str(e),str(string)) )
+
+class FilterModule(object):
+ ''' A filter to split a string into a list. '''
+ def filters(self):
+ return {
+ 'split' : split_string,
+ 'split_regex' : split_regex,
+ }
+
\ No newline at end of file
diff --git a/tomcat.yaml b/tomcat.yaml
index 31a17fe..568135a 100644
--- a/tomcat.yaml
+++ b/tomcat.yaml
@@ -18,6 +18,16 @@
groups: docker
append: yes
+ - name: copy users file
+ copy:
+ src: tomcat/tomcat-users.xml
+ dest: /tmp/tomcat-users.xml
+ force: yes
+ owner: "{{ user }}"
+ group: "{{ user }}"
+ notify:
+ - restart tomcat docker
+
- name: run tomcat docker
docker:
name: tomcat
@@ -27,6 +37,23 @@
ports:
- "0.0.0.0:{{ tomcat_port }}:8080"
volumes:
- - "/var/tomcat:/usr/local/tomcat/webapps"
-
+ - "/tmp/tomcat-users.xml:/usr/local/tomcat/conf/tomcat-users.xml"
state: reloaded
+ notify:
+ - restart tomcat docker
+
+
+ handlers:
+
+ - name: restart tomcat docker
+ docker_container:
+ name: tomcat
+ image: tomcat:jre8
+ restart: yes
+ ports:
+ - "0.0.0.0:{{ tomcat_port }}:8080"
+ volumes:
+ - "/tmp/tomcat-users.xml:/usr/local/tomcat/conf/tomcat-users.xml"
+
+
+
diff --git a/scratches/tomcat-users.xml b/tomcat/tomcat-users.xml
similarity index 82%
rename from scratches/tomcat-users.xml
rename to tomcat/tomcat-users.xml
index 41e196b..80f52ce 100644
--- a/scratches/tomcat-users.xml
+++ b/tomcat/tomcat-users.xml
@@ -1,8 +1,7 @@
-
+
-