Skip to content

Commit 92dc61c

Browse files
Dan33lDan33l
authored
Merge pull request #310 from Dan33l/multinode_acceptance
add acceptance tests with real vpn client/server setup
2 parents e105b2f + 9afc6df commit 92dc61c

File tree

6 files changed

+179
-146
lines changed

6 files changed

+179
-146
lines changed

‎.travis.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,127 +28,127 @@ matrix:
2828
- rvm: 2.5.1
2929
bundler_args: --without development release
3030
dist: trusty
31-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64{hypervisor=docker} CHECK=beaker
31+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1804-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
3232
services: docker
3333
sudo: required
3434
- rvm: 2.5.1
3535
bundler_args: --without development release
3636
dist: trusty
37-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64{hypervisor=docker} CHECK=beaker
37+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1804-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
3838
services: docker
3939
sudo: required
4040
- rvm: 2.5.1
4141
bundler_args: --without development release
4242
dist: trusty
43-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1804-64{hypervisor=docker} CHECK=beaker
43+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1804-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1804-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
4444
services: docker
4545
sudo: required
4646
- rvm: 2.5.1
4747
bundler_args: --without development release
4848
dist: trusty
49-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64{hypervisor=docker} CHECK=beaker
49+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1604-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
5050
services: docker
5151
sudo: required
5252
- rvm: 2.5.1
5353
bundler_args: --without development release
5454
dist: trusty
55-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64{hypervisor=docker} CHECK=beaker
55+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1604-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
5656
services: docker
5757
sudo: required
5858
- rvm: 2.5.1
5959
bundler_args: --without development release
6060
dist: trusty
61-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1604-64{hypervisor=docker} CHECK=beaker
61+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1604-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1604-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
6262
services: docker
6363
sudo: required
6464
- rvm: 2.5.1
6565
bundler_args: --without development release
6666
dist: trusty
67-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64{hypervisor=docker} CHECK=beaker
67+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1604-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
6868
services: docker
6969
sudo: required
7070
- rvm: 2.5.1
7171
bundler_args: --without development release
7272
dist: trusty
73-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64{hypervisor=docker} CHECK=beaker
73+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1604-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
7474
services: docker
7575
sudo: required
7676
- rvm: 2.5.1
7777
bundler_args: --without development release
7878
dist: trusty
79-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1404-64{hypervisor=docker} CHECK=beaker
79+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1404-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1604-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
8080
services: docker
8181
sudo: required
8282
- rvm: 2.5.1
8383
bundler_args: --without development release
8484
dist: trusty
85-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker} CHECK=beaker
85+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-centos7-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
8686
services: docker
8787
sudo: required
8888
- rvm: 2.5.1
8989
bundler_args: --without development release
9090
dist: trusty
91-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker} CHECK=beaker
91+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-centos7-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
9292
services: docker
9393
sudo: required
9494
- rvm: 2.5.1
9595
bundler_args: --without development release
9696
dist: trusty
97-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker} CHECK=beaker
97+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=centos7-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-centos7-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
9898
services: docker
9999
sudo: required
100100
- rvm: 2.5.1
101101
bundler_args: --without development release
102102
dist: trusty
103-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos6-64{hypervisor=docker} CHECK=beaker
103+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos6-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-centos7-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
104104
services: docker
105105
sudo: required
106106
- rvm: 2.5.1
107107
bundler_args: --without development release
108108
dist: trusty
109-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos6-64{hypervisor=docker} CHECK=beaker
109+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos6-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-centos7-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
110110
services: docker
111111
sudo: required
112112
- rvm: 2.5.1
113113
bundler_args: --without development release
114114
dist: trusty
115-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=centos6-64{hypervisor=docker} CHECK=beaker
115+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=centos6-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-centos7-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
116116
services: docker
117117
sudo: required
118118
- rvm: 2.5.1
119119
bundler_args: --without development release
120120
dist: trusty
121-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker} CHECK=beaker
121+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-debian9-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
122122
services: docker
123123
sudo: required
124124
- rvm: 2.5.1
125125
bundler_args: --without development release
126126
dist: trusty
127-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker} CHECK=beaker
127+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-debian9-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
128128
services: docker
129129
sudo: required
130130
- rvm: 2.5.1
131131
bundler_args: --without development release
132132
dist: trusty
133-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker} CHECK=beaker
133+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=debian9-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-debian9-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
134134
services: docker
135135
sudo: required
136136
- rvm: 2.5.1
137137
bundler_args: --without development release
138138
dist: trusty
139-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian8-64{hypervisor=docker} CHECK=beaker
139+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian8-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-debian8-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
140140
services: docker
141141
sudo: required
142142
- rvm: 2.5.1
143143
bundler_args: --without development release
144144
dist: trusty
145-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian8-64{hypervisor=docker} CHECK=beaker
145+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian8-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-debian8-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
146146
services: docker
147147
sudo: required
148148
- rvm: 2.5.1
149149
bundler_args: --without development release
150150
dist: trusty
151-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=debian8-64{hypervisor=docker} CHECK=beaker
151+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=debian8-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-debian8-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} CHECK=beaker
152152
services: docker
153153
sudo: required
154154
branches:

‎README.md‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@ Puppet module to manage OpenVPN servers and clients.
2626
* Debian
2727
* CentOS
2828
* RedHat
29-
* Amazon
3029

3130
## Dependencies
3231
- [puppetlabs-concat 3.0.0+](https://github.com/puppetlabs/puppetlabs-concat)
3332
- [puppetlabs-stdlib 4.25.0+](https://github.com/puppetlabs/puppetlabs-stdlib)
3433

3534
## Puppet
3635

37-
* Version >= 4.7.1
36+
* Version >= 4.10.0
3837

3938
## Example
4039

@@ -126,8 +125,7 @@ Don't forget the sysctl directive ```net.ipv4.ip_forward```!
126125

127126
## Encryption Choices
128127

129-
This module provides certain default parameters for the openvpn encryption
130-
settings.
128+
This module provides certain default parameters for the openvpn encryption settings.
131129

132130
These settings have been applied in line with current "best practices" but no
133131
guarantee is given for their saftey and they could change in future.
@@ -169,7 +167,6 @@ This setting also affects the size of the dhparam file.
169167
> 2048 bits is OK, but both [NSA](https://cryptome.org/2016/01/CNSA-Suite-and-Quantum-Computing-FAQ.pdf) and [ANSSI](https://www.ssi.gouv.fr/uploads/2015/01/RGS_v-2-0_B1.pdf) recommend at least a 3072 bits for a future-proof key. As the size of the key will have an impact on speed, I leave the choice to use 2048, 3072 or 4096 bits RSA key. 4096 bits is what's most used and recommened today, but 3072 bits is still good.
170168

171169

172-
173170
### Cipher
174171

175172
The default data channel cipher is now set to `AES-256-CBC`
@@ -180,18 +177,16 @@ OpenVPN was setting its default value to `BF-CBC`. In newer versions of OpenVPN
180177
it warns that this is no longer a secure cipher.
181178
The OpenVPN documentation recommends using this setting.
182179

183-
184-
185180
### tls_cipher
186181

187182
The default tls_cipher option is now set to: `TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-256-CBC-SHA256:TLS-DHE-RSA-WITH-AES-128-GCM-SHA256:TLS-DHE-RSA-WITH-AES-128-CBC-SHA256`
188183

189184
##### Why
190185

191-
Details of these ciphers and their uses can be found in the documentation links
192-
above.
193-
186+
Details of these ciphers and their uses can be found in the documentation links above.
194187

188+
Note : TLS ciphers suites shipped with OSes ubuntu14.04 and debian8 are too old compared to our default values.
189+
If the openvpn server is running on these OSes with clients on more modern OSes, you will probably have to use custom value for option `tls_cipher`.
195190

196191
## Contributions
197192

‎spec/acceptance/01_openvpn_server_spec.rb‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎spec/acceptance/02_openvpn_client.rb‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)