Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(default) updates and corrects network definitions #283

Merged
merged 3 commits into from
Jun 24, 2023
Merged

fix(default) updates and corrects network definitions #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24daa47
fix(vpn.jenkins.io) cleanup netmask and unused networks
dduportal Jun 24, 2023
cdbbebc
cleanup(vpn.jenkins.io) removed unused accounts
dduportal Jun 24, 2023
ce1b294
cleanup(tests) update setups
dduportal Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions cert/ccd/default/abayer
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions cert/ccd/default/aheritier
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cert/ccd/default/alecharp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.29 255.255.254.0
ifconfig-push 10.8.0.29 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
2 changes: 1 addition & 1 deletion cert/ccd/default/basil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.25 255.255.254.0
ifconfig-push 10.8.0.25 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
2 changes: 1 addition & 1 deletion cert/ccd/default/danielbeck
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.4 255.255.254.0
ifconfig-push 10.8.0.4 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
2 changes: 1 addition & 1 deletion cert/ccd/default/dduportal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.5 255.255.254.0
ifconfig-push 10.8.0.5 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
2 changes: 1 addition & 1 deletion cert/ccd/default/dnusbaum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.28 255.255.254.0
ifconfig-push 10.8.0.28 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
3 changes: 0 additions & 3 deletions cert/ccd/default/garethjevans
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cert/ccd/default/halkeye
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.7 255.255.254.0
ifconfig-push 10.8.0.7 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
2 changes: 1 addition & 1 deletion cert/ccd/default/hlemeur
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.8 255.255.254.0
ifconfig-push 10.8.0.8 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
2 changes: 1 addition & 1 deletion cert/ccd/default/imontero
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.23 255.255.254.0
ifconfig-push 10.8.0.23 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
3 changes: 0 additions & 3 deletions cert/ccd/default/jequals5
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions cert/ccd/default/jthompson
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions cert/ccd/default/jvz
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cert/ccd/default/kevingrdj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.12 255.255.254.0
ifconfig-push 10.8.0.12 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
2 changes: 1 addition & 1 deletion cert/ccd/default/markewaite
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.13 255.255.254.0
ifconfig-push 10.8.0.13 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
3 changes: 0 additions & 3 deletions cert/ccd/default/mpapo
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cert/ccd/default/notmyfault
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.24 255.255.254.0
ifconfig-push 10.8.0.24 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
3 changes: 0 additions & 3 deletions cert/ccd/default/olblak
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions cert/ccd/default/oleg_nenashev
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions cert/ccd/default/olivergondza
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cert/ccd/default/slide_o_mix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.18 255.255.254.0
ifconfig-push 10.8.0.18 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
2 changes: 1 addition & 1 deletion cert/ccd/default/smerle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.19 255.255.254.0
ifconfig-push 10.8.0.19 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
2 changes: 1 addition & 1 deletion cert/ccd/default/smerleCB
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.30 255.255.254.0
ifconfig-push 10.8.0.30 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
2 changes: 1 addition & 1 deletion cert/ccd/default/timja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.20 255.255.254.0
ifconfig-push 10.8.0.20 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
2 changes: 1 addition & 1 deletion cert/ccd/default/vlatombe
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.26 255.255.254.0
ifconfig-push 10.8.0.26 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
3 changes: 0 additions & 3 deletions cert/ccd/default/vsilverman
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cert/ccd/default/wfollonier
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.22 255.255.254.0
ifconfig-push 10.8.0.22 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
2 changes: 1 addition & 1 deletion cert/ccd/default/yafenkin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ifconfig-push 10.8.0.27 255.255.254.0
ifconfig-push 10.8.0.27 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.240.0.0 255.252.0.0"
16 changes: 2 additions & 14 deletions config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,11 @@
#
networks:
- name: default
iprange: 10.8.0.1/24
netmask: 255.255.254.0
routes:
# prod-jenkins-public-prod/data-tier
- 10.0.2.0/24
# prod-jenkins-private-prod-vnet
- 10.240.0.0/14
- name: admin
iprange: 10.8.1.1/24
netmask: 255.255.254.0
iprange: 10.8.0.0/24
netmask: 255.255.255.0
routes:
# prod-jenkins-public-prod/app-tier
- 10.0.1.0/24
# prod-jenkins-public-prod/data-tier
- 10.0.2.0/24
# prod-jenkins-public-prod/dmz-tier
- 10.0.99.0/24
# prod-jenkins-private-prod-vnet
- 10.240.0.0/14
- name: private
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
- "AUTH_LDAP_GROUPS_MEMBER=cn=all"
- "OPENVPN_NETWORK_NAME=mocked-vnet"
- "OPENVPN_SERVER_SUBNET=10.8.0.0"
- "OPENVPN_SERVER_NETMASK=255.255.254.0"
- "OPENVPN_SERVER_NETMASK=255.255.255.0"
volumes:
- ./mock/vpn/ccd:/home/openvpn/available-ccds:ro
- ./mock/vpn/ca.crt:/etc/openvpn/server/ca.crt:ro
Expand Down
2 changes: 1 addition & 1 deletion docker/mock/vpn/ccd/alice
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ifconfig-push 10.8.0.66 255.255.255.0
push "route 10.0.1.0 255.255.255.0"
push "route 10.0.2.0 255.255.255.0"
3 changes: 1 addition & 2 deletions docker/mock/vpn/ccd/kohsuke
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ifconfig-push 10.8.1.3 255.255.254.0
push "route 10.0.1.0 255.255.255.0"
ifconfig-push 10.8.1.3 255.255.255.0
push "route 10.0.2.0 255.255.255.0"
push "route 10.0.99.0 255.255.255.0"