diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-09-12 10:46:28 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-09-12 10:46:28 -0300 |
| commit | 07627004e7cf0babb71dd7e24375a8e5d56d24a6 (patch) | |
| tree | c2c6d4340d2a5ab258e0c49b2bd43e1f1dd1bc07 /manifests/role | |
| parent | 9873d7f131b156c88ba6a87c45c0b911a0986dba (diff) | |
| download | puppet-nodo-07627004e7cf0babb71dd7e24375a8e5d56d24a6.tar.gz puppet-nodo-07627004e7cf0babb71dd7e24375a8e5d56d24a6.tar.bz2 | |
Fix nodo::base::virtual inheritances
Diffstat (limited to 'manifests/role')
| -rw-r--r-- | manifests/role/bitcoin.pp | 2 | ||||
| -rw-r--r-- | manifests/role/dns.pp | 2 | ||||
| -rw-r--r-- | manifests/role/jabber.pp | 2 | ||||
| -rw-r--r-- | manifests/role/mumble.pp | 2 | ||||
| -rw-r--r-- | manifests/role/proxy.pp | 2 | ||||
| -rw-r--r-- | manifests/role/storage.pp | 2 | ||||
| -rw-r--r-- | manifests/role/tor.pp | 2 | ||||
| -rw-r--r-- | manifests/role/web.pp | 2 | ||||
| -rw-r--r-- | manifests/role/yacy.pp | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/manifests/role/bitcoin.pp b/manifests/role/bitcoin.pp index 0cfe25f..a5261a3 100644 --- a/manifests/role/bitcoin.pp +++ b/manifests/role/bitcoin.pp @@ -1,4 +1,4 @@ -class nodo::role::bitcoin inherits nodo::base::vserver { +class nodo::role::bitcoin inherits nodo::base::virtual { include nodo::role::virtual include onion include onion::socks diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp index 10aabb6..473e7a8 100644 --- a/manifests/role/dns.pp +++ b/manifests/role/dns.pp @@ -1,4 +1,4 @@ -class nodo::role::dns inherits nodo::base::vserver { +class nodo::role::dns inherits nodo::base::virtual { include bind # Put your custom DNS config in this class diff --git a/manifests/role/jabber.pp b/manifests/role/jabber.pp index c1d0494..1782fce 100644 --- a/manifests/role/jabber.pp +++ b/manifests/role/jabber.pp @@ -1,4 +1,4 @@ -class nodo::role::jabber inherits nodo::base::vserver { +class nodo::role::jabber inherits nodo::base::virtual { include ssl include ejabberd diff --git a/manifests/role/mumble.pp b/manifests/role/mumble.pp index c69d8f3..42a2c33 100644 --- a/manifests/role/mumble.pp +++ b/manifests/role/mumble.pp @@ -1,4 +1,4 @@ -class nodo::role::mumble inherits nodo::base::vserver { +class nodo::role::mumble inherits nodo::base::virtual { include mumble::ssl include mumble::munin diff --git a/manifests/role/proxy.pp b/manifests/role/proxy.pp index 9c6186d..dc8edf0 100644 --- a/manifests/role/proxy.pp +++ b/manifests/role/proxy.pp @@ -1,4 +1,4 @@ -class nodo::role::proxy inherits nodo::base::vserver { +class nodo::role::proxy inherits nodo::base::virtual { class { 'nginx': } ssl::cert { "$::domain": diff --git a/manifests/role/storage.pp b/manifests/role/storage.pp index 144c367..8711e44 100644 --- a/manifests/role/storage.pp +++ b/manifests/role/storage.pp @@ -1,3 +1,3 @@ -class nodo::role::storage inherits nodo::base::vserver { +class nodo::role::storage inherits nodo::base::virtual { include nodo::utils::storage } diff --git a/manifests/role/tor.pp b/manifests/role/tor.pp index 35da3b5..07ae5a0 100644 --- a/manifests/role/tor.pp +++ b/manifests/role/tor.pp @@ -1,4 +1,4 @@ -class nodo::role::tor inherits nodo::base::vserver { +class nodo::role::tor inherits nodo::base::virtual { include tor::daemon include nodo::utils::tor } diff --git a/manifests/role/web.pp b/manifests/role/web.pp index bf03860..3c0355f 100644 --- a/manifests/role/web.pp +++ b/manifests/role/web.pp @@ -1,4 +1,4 @@ -class nodo::role::web inherits nodo::base::vserver { +class nodo::role::web inherits nodo::base::virtual { # Hidden services $hidden = hiera('apache::site::hidden', false) if $hidden == true { diff --git a/manifests/role/yacy.pp b/manifests/role/yacy.pp index e1fa6ed..d047c83 100644 --- a/manifests/role/yacy.pp +++ b/manifests/role/yacy.pp @@ -1,4 +1,4 @@ -class nodo::role::yacy inherits nodo::base::vserver { +class nodo::role::yacy inherits nodo::base::virtual { class { 'onion': } package { 'yacy': |