diff --git a/cli/.bash_cli b/cli/.bash_cli new file mode 100644 index 0000000..e69de29 diff --git a/cli/ansible b/cli/ansible new file mode 100755 index 0000000..2f84f3f --- /dev/null +++ b/cli/ansible @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +echo -e "\033[36mStarting\033[39m: Ansible" + +# shellcheck disable=SC2068 +docker run --rm -i\ + -v ~/.ssh:/home/user/.ssh \ + -u 1000 \ + -v ${PWD}:/opt/project \ + -w /opt/project \ + dkregistry.xai-corp.net:5000/xaicorp/ansible:2.7 -i inventory.conf -u ansible $@ diff --git a/cli/ansible-dev b/cli/ansible-dev new file mode 100755 index 0000000..049901c --- /dev/null +++ b/cli/ansible-dev @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +echo -e "\033[36mStarting\033[39m: Ansible" + + +# shellcheck disable=SC2068 +docker run --rm \ + -it \ + -v $(pwd):/opt/project \ + -v ~/.ssh:/user/.ssh \ + -u $(id -u):$(id -g) \ + --workdir /opt/project \ + --entrypoint /bin/bash \ + dkregistry.xai-corp.net:5000/xaicorp/ansible:2.0 $@ diff --git a/cli/ansible-dev.help b/cli/ansible-dev.help new file mode 100644 index 0000000..7aa5493 --- /dev/null +++ b/cli/ansible-dev.help @@ -0,0 +1,3 @@ +ARGS - The arguments you wish to provide to this command + +TODO: Fill out the help information for this command. diff --git a/cli/ansible-dev.usage b/cli/ansible-dev.usage new file mode 100644 index 0000000..5226895 --- /dev/null +++ b/cli/ansible-dev.usage @@ -0,0 +1 @@ +ARGS... diff --git a/cli/ansible.help b/cli/ansible.help new file mode 100644 index 0000000..7aa5493 --- /dev/null +++ b/cli/ansible.help @@ -0,0 +1,3 @@ +ARGS - The arguments you wish to provide to this command + +TODO: Fill out the help information for this command. diff --git a/cli/ansible.usage b/cli/ansible.usage new file mode 100644 index 0000000..5226895 --- /dev/null +++ b/cli/ansible.usage @@ -0,0 +1 @@ +ARGS... diff --git a/dockerfiles/services/gitea/docker-compose.yml b/dockerfiles/services/gitea/docker-compose.yml index 8658bc8..bbb94a2 100644 --- a/dockerfiles/services/gitea/docker-compose.yml +++ b/dockerfiles/services/gitea/docker-compose.yml @@ -1,5 +1,5 @@ --- -# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d +# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d # DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml gitea version: '3.4' diff --git a/dockerfiles/services/jenkins/docker-compose.yml b/dockerfiles/services/jenkins/docker-compose.yml index 9909566..dc81da2 100644 --- a/dockerfiles/services/jenkins/docker-compose.yml +++ b/dockerfiles/services/jenkins/docker-compose.yml @@ -1,5 +1,5 @@ --- -# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d +# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d # DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml jenkins version: '3.4' diff --git a/dockerfiles/services/orangescrum/docker-compose.yml b/dockerfiles/services/orangescrum/docker-compose.yml index d05bf68..13c2ae1 100644 --- a/dockerfiles/services/orangescrum/docker-compose.yml +++ b/dockerfiles/services/orangescrum/docker-compose.yml @@ -1,5 +1,5 @@ --- -# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d +# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d version: '2' services: diff --git a/dockerfiles/services/services/fluentd/docker-compose-prod.yml b/dockerfiles/services/services/fluentd/docker-compose-prod.yml index 5f79a2a..6ac797a 100644 --- a/dockerfiles/services/services/fluentd/docker-compose-prod.yml +++ b/dockerfiles/services/services/fluentd/docker-compose-prod.yml @@ -1,7 +1,7 @@ --- # Based on https://hub.docker.com/r/fluent/fluentd/ # -# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d +# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d # # docker login dkregistry.xai-corp.net:5000 # docker-compose build && docker push dkregistry.xai-corp.net:5000/fluentd:latest diff --git a/dockerfiles/services/services/fluentd/docker-compose.yml b/dockerfiles/services/services/fluentd/docker-compose.yml index 643e90b..3d7026b 100644 --- a/dockerfiles/services/services/fluentd/docker-compose.yml +++ b/dockerfiles/services/services/fluentd/docker-compose.yml @@ -1,7 +1,7 @@ --- # Based on https://hub.docker.com/r/fluent/fluentd/ # -# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d +# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d # # docker login dkregistry.xai-corp.net:5000 # docker-compose build && docker push dkregistry.xai-corp.net:5000/fluentd:latest diff --git a/dockerfiles/services/shipyard/docker-compose.yml b/dockerfiles/services/shipyard/docker-compose.yml index 55db919..6c00a26 100644 --- a/dockerfiles/services/shipyard/docker-compose.yml +++ b/dockerfiles/services/shipyard/docker-compose.yml @@ -26,7 +26,7 @@ services: - manage - --host - tcp://0.0.0.0:3375 - - etcd://192.168.2.53:4001 + - etcd://192.168.4.53:4001 shipyard-controller: restart: always diff --git a/dockerfiles/services/sslproxy/docker-compose.prod.yml b/dockerfiles/services/sslproxy/docker-compose.prod.yml index d85b8ac..0831b80 100644 --- a/dockerfiles/services/sslproxy/docker-compose.prod.yml +++ b/dockerfiles/services/sslproxy/docker-compose.prod.yml @@ -1,5 +1,5 @@ --- -# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d +# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d # docker login dkregistry.xai-corp.net:5000 # docker-compose build && docker push dkregistry.xai-corp.net:5000/sslproxy:2.1 # DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose-prod.yml sslproxy diff --git a/dockerfiles/services/sslproxy/docker-compose.yml b/dockerfiles/services/sslproxy/docker-compose.yml index c9356cb..c69a652 100644 --- a/dockerfiles/services/sslproxy/docker-compose.yml +++ b/dockerfiles/services/sslproxy/docker-compose.yml @@ -1,5 +1,5 @@ --- -# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d +# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d # docker login dkregistry.xai-corp.net:5000 # docker-compose build && docker push dkregistry.xai-corp.net:5000/sslproxy:2.1 # DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose.yml sslproxy diff --git a/dockerfiles/services/ui/docker-compose.yml b/dockerfiles/services/ui/docker-compose.yml index 1bc384e..aff66d0 100644 --- a/dockerfiles/services/ui/docker-compose.yml +++ b/dockerfiles/services/ui/docker-compose.yml @@ -1,5 +1,5 @@ --- -# DOCKER_HOST=192.168.2.41:2376 docker-compose up -d +# DOCKER_HOST=192.168.4.41:2376 docker-compose up -d # DOCKER_HOST=dkmanager:2376 docker stack deploy -c docker-compose.yml dkui version: '3.4' diff --git a/inventory.conf b/inventory.conf index 9ad8054..734ff1e 100644 --- a/inventory.conf +++ b/inventory.conf @@ -1,29 +1,29 @@ localhost ansible_connection=local [managed] -home ansible_ssh_host=192.168.2.11 -home02 ansible_ssh_host=192.168.2.22 -#dkhost01 ansible_ssh_host=192.168.2.41 -#dkhost02 ansible_ssh_host=192.168.2.52 -#dkhost03 ansible_ssh_host=192.168.2.53 -#dkhost04 ansible_ssh_host=192.168.2.54 -#dkhost05 ansible_ssh_host=192.168.2.55 -cubox-i ansible_ssh_host=192.168.2.12 +home ansible_ssh_host=192.168.4.11 +home02 ansible_ssh_host=192.168.4.22 +#dkhost01 ansible_ssh_host=192.168.4.41 +#dkhost02 ansible_ssh_host=192.168.4.52 +#dkhost03 ansible_ssh_host=192.168.4.53 +#dkhost04 ansible_ssh_host=192.168.4.54 +#dkhost05 ansible_ssh_host=192.168.4.55 +cubox-i ansible_ssh_host=192.168.4.12 [dkhost] -dkhost01 ansible_ssh_host=192.168.2.41 -dkhost02 ansible_ssh_host=192.168.2.52 -#dkhost03 ansible_ssh_host=192.168.2.53 -dkhost04 ansible_ssh_host=192.168.2.54 -#dkhost05 ansible_ssh_host=192.168.2.55 -home ansible_ssh_host=192.168.2.11 +dkhost01 ansible_ssh_host=192.168.4.41 +dkhost02 ansible_ssh_host=192.168.4.52 +#dkhost03 ansible_ssh_host=192.168.4.53 +dkhost04 ansible_ssh_host=192.168.4.54 +#dkhost05 ansible_ssh_host=192.168.4.55 +home ansible_ssh_host=192.168.4.11 #localhost ansible_connection=local [ns] -home02 ansible_ssh_host=192.168.2.22 -cubox-i ansible_ssh_host=192.168.2.12 +home02 ansible_ssh_host=192.168.4.22 +cubox-i ansible_ssh_host=192.168.4.12 [gfs] -home ansible_ssh_host=192.168.2.11 -cubox-i ansible_ssh_host=192.168.2.12 +home ansible_ssh_host=192.168.4.11 +cubox-i ansible_ssh_host=192.168.4.12 diff --git a/roles/docker_graylog/files/docker-compose.yml b/roles/docker_graylog/files/docker-compose.yml index 5860128..4b8a4c4 100644 --- a/roles/docker_graylog/files/docker-compose.yml +++ b/roles/docker_graylog/files/docker-compose.yml @@ -20,7 +20,7 @@ services: environment: GRAYLOG_PASSWORD_SECRET: gsahu1dj901hdaiuafg3g1q GRAYLOG_ROOT_PASSWORD_SHA2: 8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918 - GRAYLOG_WEB_ENDPOINT_URI: http://192.168.2.41:9000/api/ + GRAYLOG_WEB_ENDPOINT_URI: http://192.168.4.41:9000/api/ depends_on: - mongo - elasticsearch diff --git a/roles/docker_registry/files/docker-compose.yml b/roles/docker_registry/files/docker-compose.yml index 55388fa..fee78cf 100644 --- a/roles/docker_registry/files/docker-compose.yml +++ b/roles/docker_registry/files/docker-compose.yml @@ -9,8 +9,8 @@ registry: # REGISTRY_HTTP_TLS_KEY: /certs/privkey.pem REGISTRY_HTTP_LETSENCRYPT_CACHEFILE: /var/run/letsencrypt.cache REGISTRY_HTTP_LETSENCRYPT_EMAIL: r_morgan@sympatico.ca -# REGISTRY_HTTP_HOST: https://192.168.2.41:5000 -# REGISTRY_HTTP_ADDR: 192.168.2.41:5000 +# REGISTRY_HTTP_HOST: https://192.168.4.41:5000 +# REGISTRY_HTTP_ADDR: 192.168.4.41:5000 REGISTRY_AUTH: htpasswd REGISTRY_AUTH_HTPASSWD_PATH: /auth/htpasswd REGISTRY_AUTH_HTPASSWD_REALM: Registry Realm diff --git a/roles/dockerhost/files/daemon.json b/roles/dockerhost/files/daemon.json index 1a038bd..92d6f6d 100644 --- a/roles/dockerhost/files/daemon.json +++ b/roles/dockerhost/files/daemon.json @@ -3,8 +3,8 @@ "dkhost.xai-corp.net:5000" ], "dns": [ - "192.168.2.12", - "192.168.2.22", + "192.168.4.12", + "192.168.4.22", "8.8.8.8" ] } diff --git a/roles/home.xai-corp.net/templates/home.xai-corp.net.j2 b/roles/home.xai-corp.net/templates/home.xai-corp.net.j2 index 18a0eb2..14de8bc 100644 --- a/roles/home.xai-corp.net/templates/home.xai-corp.net.j2 +++ b/roles/home.xai-corp.net/templates/home.xai-corp.net.j2 @@ -4,7 +4,7 @@ ServerName home.xai-corp.net Redirect / https://home.xai-corp.net/ - + ServerName home.xai-corp.net ServerAdmin admin@xai-corp.net @@ -21,7 +21,7 @@ Options Indexes FollowSymLinks AllowOverride All Order deny,allow - Allow from 192.168.2. + Allow from 192.168.4. diff --git a/roles/home.xai-corp.net/templates/sql.xai-corp.net.j2 b/roles/home.xai-corp.net/templates/sql.xai-corp.net.j2 index b019a89..0b3e526 100644 --- a/roles/home.xai-corp.net/templates/sql.xai-corp.net.j2 +++ b/roles/home.xai-corp.net/templates/sql.xai-corp.net.j2 @@ -21,7 +21,7 @@ Options Indexes FollowSymLinks AllowOverride All Order deny,allow - Allow from 192.168.2. + Allow from 192.168.4. diff --git a/roles/ns.xai-corp.net/templates/named.conf.j2 b/roles/ns.xai-corp.net/templates/named.conf.j2 index d08d92c..eb7f6cd 100644 --- a/roles/ns.xai-corp.net/templates/named.conf.j2 +++ b/roles/ns.xai-corp.net/templates/named.conf.j2 @@ -23,7 +23,7 @@ acl "xfer" { */ acl "trusted" { 127.0.0.0/8; - 192.168.2.0/24; + 192.168.4.0/24; ::1/128; }; @@ -35,7 +35,7 @@ options { //bindkeys-file "/etc/bind/bind.keys"; /*listen-on-v6 { ::1; };*/ - listen-on { 127.0.0.1; 192.168.2.12; }; + listen-on { 127.0.0.1; 192.168.4.12; }; allow-query { /* @@ -123,7 +123,7 @@ controls { }; view "internal" { - match-clients { 192.168.2.12; localhost; 192.168.2.0/24; }; + match-clients { 192.168.4.12; localhost; 192.168.4.0/24; }; recursion yes; zone "." in { @@ -149,7 +149,7 @@ view "internal" { allow-transfer { none; }; }; - zone "2.168.192.in-addr.arpa." IN { + zone "4.168.192.in-addr.arpa." IN { type master; file "pri/xai-corp.net.reverse"; allow-update { none; }; diff --git a/roles/ns.xai-corp.net/templates/named.conf.local.j2 b/roles/ns.xai-corp.net/templates/named.conf.local.j2 index 8ec9be5..bbf5ffd 100644 --- a/roles/ns.xai-corp.net/templates/named.conf.local.j2 +++ b/roles/ns.xai-corp.net/templates/named.conf.local.j2 @@ -29,7 +29,7 @@ view "internal" { allow-transfer { none; }; }; - zone "2.168.192.in-addr.arpa." IN { + zone "4.168.192.in-addr.arpa." IN { type master; file "/etc/bind/db.xai-corp.net.reverse"; allow-update { none; }; diff --git a/roles/ns.xai-corp.net/templates/named.conf.options.j2 b/roles/ns.xai-corp.net/templates/named.conf.options.j2 index bf5ae57..a8e137e 100644 --- a/roles/ns.xai-corp.net/templates/named.conf.options.j2 +++ b/roles/ns.xai-corp.net/templates/named.conf.options.j2 @@ -23,7 +23,7 @@ acl "xfer" { */ acl "trusted" { 127.0.0.0/8; - 192.168.2.0/24; + 192.168.4.0/24; ::1/128; }; 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 1122348..4559cc8 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 @@ -8,50 +8,50 @@ $TTL 1D xai-corp.net. IN NS ns.xai-corp.net. xai-corp.net. IN MX 0 mail.xai-corp.net. -xai-corp.net. IN TXT "v=spf1 ip4:192.168.2.11/32 mx ptr mx:mail.xai-corp.net ~all" -;mail IN A 192.168.2.12 +xai-corp.net. IN TXT "v=spf1 ip4:192.168.4.11/32 mx ptr mx:mail.xai-corp.net ~all" +;mail IN A 192.168.4.12 -gateway IN A 192.168.2.1 -wireless IN A 192.168.2.3 -printer IN A 192.168.2.13 +gateway IN A 192.168.4.4 +wireless IN A 192.168.4.3 +printer IN A 192.168.4.13 scanner IN CNAME printer -laser IN A 192.168.2.14 -tv IN A 192.168.2.16 -xaicorp1 IN A 192.168.2.103 -garden IN A 192.168.2.20 +laser IN A 192.168.4.14 +tv IN A 192.168.4.16 +xaicorp1 IN A 192.168.4.103 +garden IN A 192.168.4.20 ; bare metal servers -home IN A 192.168.2.11 -cubox-i IN A 192.168.2.12 +home IN A 192.168.4.11 +cubox-i IN A 192.168.4.12 ; virtual machine servers -home02 IN A 192.168.2.22 -dkhost01 IN A 192.168.2.41 -dkhost02 IN A 192.168.2.52 -dkhost03 IN A 192.168.2.53 -dkhost04 IN A 192.168.2.54 -dkhost05 IN A 192.168.2.55 +home02 IN A 192.168.4.22 +dkhost01 IN A 192.168.4.41 +dkhost02 IN A 192.168.4.52 +dkhost03 IN A 192.168.4.53 +dkhost04 IN A 192.168.4.54 +dkhost05 IN A 192.168.4.55 ; dns servers -ns IN A 192.168.2.22 +ns IN A 192.168.4.22 ns02 IN CNAME cubox-i ; gluster servers -gluster IN A 192.168.2.11 -;gluster IN A 192.168.2.12 +gluster IN A 192.168.4.11 +;gluster IN A 192.168.4.12 ; docker swarm nodes -dkhost IN A 192.168.2.11 -;dkhost IN A 192.168.2.41 -;dkhost IN A 192.168.2.52 -;dkhost IN A 192.168.2.53 -;dkhost IN A 192.168.2.54 -;dkhost IN A 192.168.2.55 +dkhost IN A 192.168.4.11 +;dkhost IN A 192.168.4.41 +;dkhost IN A 192.168.4.52 +;dkhost IN A 192.168.4.53 +;dkhost IN A 192.168.4.54 +;dkhost IN A 192.168.4.55 ; docker swarm managers -dkmanager IN A 192.168.2.11 -;dkmanager IN A 192.168.2.52 -;dkmanager IN A 192.168.2.54 +dkmanager IN A 192.168.4.11 +;dkmanager IN A 192.168.4.52 +;dkmanager IN A 192.168.4.54 ; service domains fs IN CNAME dkhost diff --git a/roles/ns.xai-corp.net/templates/xai-corp.net.reverse.j2 b/roles/ns.xai-corp.net/templates/xai-corp.net.reverse.j2 index c9befd0..98f3734 100644 --- a/roles/ns.xai-corp.net/templates/xai-corp.net.reverse.j2 +++ b/roles/ns.xai-corp.net/templates/xai-corp.net.reverse.j2 @@ -1,5 +1,5 @@ $TTL 24h -$ORIGIN 2.168.192.IN-ADDR.ARPA. +$ORIGIN 4.168.192.IN-ADDR.ARPA. @ IN SOA ns.xai-corp.net. root.xai-corp.net. ( 20150920; serial 3h ; refresh diff --git a/roles/td-agent-bit/files/td.conf b/roles/td-agent-bit/files/td.conf index c7c9178..60b35d3 100644 --- a/roles/td-agent-bit/files/td.conf +++ b/roles/td-agent-bit/files/td.conf @@ -11,6 +11,6 @@ [OUTPUT] Name Forward - Host 192.168.2.24 + Host 192.168.4.24 Port 24224 Match ** diff --git a/test-ping.yml b/test-ping.yml index 831b0f4..4cc629a 100644 --- a/test-ping.yml +++ b/test-ping.yml @@ -2,10 +2,9 @@ # playbook to install django test on home.xai-corp.net - hosts: managed - remote_user: root remote_user: ansible gather_facts: yes - become: true +# become: true tasks: - name: test connection