diff --git a/dockerfiles/jenkins/docker-compose.yml b/dockerfiles/jenkins/docker-compose.yml index 2c3c8b7..acf133c 100644 --- a/dockerfiles/jenkins/docker-compose.yml +++ b/dockerfiles/jenkins/docker-compose.yml @@ -9,7 +9,7 @@ services: image: "jenkins:alpine" volumes: - - /opt/shared/jenkins/home:/var/jenkins_home + - /var/lib/jenkins:/var/jenkins_home ports: - "8080:8080" - "5001:5000" diff --git a/dockerfiles/sslproxy/host.conf b/dockerfiles/sslproxy/host.conf index 64234fe..6b0f332 100644 --- a/dockerfiles/sslproxy/host.conf +++ b/dockerfiles/sslproxy/host.conf @@ -9,7 +9,7 @@ server { add_header Strict-Transport-Security "max-age=600; includeSubDomains" always; location / { - proxy_pass http://192.168.2.41:8081; + proxy_pass http://192.168.2.43:8081; } } @@ -43,7 +43,6 @@ server { location / { proxy_pass http://192.168.2.43:8080; } - } # jenkins.xai-corp.net @@ -57,7 +56,7 @@ server { add_header Strict-Transport-Security "max-age=600; includeSubDomains" always; location / { - proxy_pass http://192.168.2.41:8080; + proxy_pass http://192.168.2.43:8080; } } @@ -73,7 +72,7 @@ server { location / { proxy_set_header Connection $http_connection; - proxy_pass http://192.168.2.41:9000; + proxy_pass http://192.168.2.43:9000; } } diff --git a/dockerfiles/sslproxy/readme.md b/dockerfiles/sslproxy/readme.md new file mode 100644 index 0000000..00d2c14 --- /dev/null +++ b/dockerfiles/sslproxy/readme.md @@ -0,0 +1 @@ +DOCKER_HOST=dkhost02:2376 docker-compose up -d --build diff --git a/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 b/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 index 6bc70bb..41fcf36 100644 --- a/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 +++ b/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 @@ -30,14 +30,15 @@ gluster IN A 192.168.2.12 home02 IN A 192.168.2.22 dkhost01 IN A 192.168.2.41 -fs IN A 192.168.2.41 -git IN A 192.168.2.41 -jenkins IN A 192.168.2.41 dkregistry IN A 192.168.2.41 -dkui IN A 192.168.2.41 sql IN A 192.168.2.41 tripbuilder IN A 192.168.2.41 logs IN A 192.168.2.42 dkhost02 IN A 192.168.2.43 +fs IN A 192.168.2.43 +git IN A 192.168.2.43 +dkui IN A 192.168.2.41 +jenkins IN A 192.168.2.41 +