Skip to content
Snippets Groups Projects
Commit 85428903 authored by Nils Olof Paulsson's avatar Nils Olof Paulsson
Browse files

Merge branch 'devel' into 'production'

Devel

See merge request !8
parents 2aa57e70 4e31f77c
No related branches found
No related tags found
2 merge requests!15Revert "fix more name conflicts",!8Devel
Pipeline #130921 passed
class vlc::nginx_cert {
$hostname = fact( 'networking.fqdn' )
$hostalias = ['vlcinv.itn.liu.se']
profiles::letsencrypt::cert { $hostname:
common_name => $hostname,
addn_domains => $hostalias,
}
}
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
class vlc::nginx_vlc () { class vlc::nginx_vlc () {
$hostname = fact( 'networking.fqdn' ) $hostname = fact( 'networking.fqdn' )
$hostalias = [] $hostalias = []
profiles::letsencrypt::cert { $hostname: include vlc::nginx_cert
common_name => $hostname,
addn_domains => $hostalias,
}
package { 'nginx': package { 'nginx':
ensure => 'installed', ensure => 'installed',
......
#assign certificate and copies vlcinv.conf to the right location #assign certificate and copies vlcinv.conf to the right location
class vlc::nginx_vlcinv () { class vlc::nginx_vlcinv () {
$hostname = fact( 'networking.fqdn' ) include vlc::nginx_cert
$hostalias = ['vlcinv.itn.liu.se']
profiles::letsencrypt::cert { $hostname:
common_name => $hostname,
addn_domains => $hostalias,
}
file { '/etc/nginx/conf.d/vlcinv.conf': file { '/etc/nginx/conf.d/vlcinv.conf':
ensure => 'file', ensure => 'file',
source => "puppet:///modules/${module_name}/vlcinv.conf", source => "puppet:///modules/${module_name}/vlcinv.conf",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment