Skip to content

Commit 2ee0c1f

Browse files
committed
Clean tree, fix test setup and minor code fix
1 parent b302f69 commit 2ee0c1f

File tree

12 files changed

+8
-244
lines changed

12 files changed

+8
-244
lines changed

.github/workflows/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ jobs:
2020
puppet:
2121
name: Puppet
2222
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3
23+
with:
24+
beaker_hosts: 'vpnserver:ma;vpnclienta:a'

.sync.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
spec/spec_helper.rb:
3-
hiera_config: "'spec/fixtures/hiera/hiera.yaml'"
42
spec/spec_helper_acceptance.rb:
53
unmanaged: false
4+
.github/workflows/ci.yml:
5+
with:
6+
beaker_hosts: 'vpnserver:ma;vpnclienta:a'

Vagrantfile

-39
This file was deleted.

manifests/install.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
class openvpn::install {
55
include openvpn
66

7-
ensure_packages(['openvpn'])
7+
stdlib::ensure_packages(['openvpn'])
88
if $openvpn::additional_packages {
9-
ensure_packages($openvpn::additional_packages)
9+
stdlib::ensure_packages($openvpn::additional_packages)
1010
}
1111

1212
if $facts['os']['family'] == 'Archlinux' {

manifests/revoke.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
}
5656

5757
if ($openvpn::easyrsa_version == '3.0') {
58-
exec { "copy renewed crl.pem to ${name} keys directory because of revocation of ${name}":
58+
exec { "copy renewed crl.pem to ${server} keys directory because of revocation of ${name}":
5959
command => "cp ${server_directory}/${server}/easy-rsa/keys/crl.pem ${server_directory}/${server}/crl.pem",
6060
subscribe => Exec["renew crl.pem on ${server} because of revocation of ${name}"],
6161
provider => 'shell',

spec/classes/openvpn_init_hiera_spec.rb

-89
This file was deleted.

spec/fixtures/hiera/hiera.yaml

-7
This file was deleted.

spec/fixtures/hiera/test.yaml

-44
This file was deleted.

vagrant/Puppetfile

-2
This file was deleted.

vagrant/client.pp

-3
This file was deleted.

vagrant/provision_module.sh

-20
This file was deleted.

vagrant/server.pp

-35
This file was deleted.

0 commit comments

Comments
 (0)