Skip to content
Snippets Groups Projects
Commit ee86894d authored by Alexander Olofsson's avatar Alexander Olofsson
Browse files

Merge branch 'handover-finalize' into 'devel'

Handover finalize

See merge request !13
parents a8e79bf2 8f10f27d
No related branches found
No related tags found
2 merge requests!14Merge Devel,!13Handover finalize
Pipeline #3737 passed
...@@ -92,15 +92,17 @@ class skadereg( ...@@ -92,15 +92,17 @@ class skadereg(
} }
apache::vhost { "${facts['networking']['fqdn']}:443": apache::vhost { "${facts['networking']['fqdn']}:443":
servername => $facts['networking']['fqdn'], servername => $facts['networking']['fqdn'],
port => '443', port => '443',
ssl => true, ssl => true,
ssl_cert => $cert, ssl_cert => $cert,
ssl_chain => $chain, ssl_chain => $chain,
ssl_key => $key, ssl_key => $key,
headers => ['Set Strict-Transport-Security "max-age=31536000"',], headers => ['Set Strict-Transport-Security "max-age=31536000"',],
docroot => '/var/www/skadereg/public', docroot => '/var/www/skadereg/public',
directories => [ docroot_owner => 'apache',
docroot_group => 'skadereg',
directories => [
{ {
path => '/var/www/skadereg/public', path => '/var/www/skadereg/public',
allow_override => [ 'ALL' ], allow_override => [ 'ALL' ],
...@@ -121,7 +123,7 @@ class skadereg( ...@@ -121,7 +123,7 @@ class skadereg(
ensure => latest, ensure => latest,
before => File['/var/www/skadereg/public'], before => File['/var/www/skadereg/public'],
provider => git, provider => git,
source => 'ssh://git@gitlab.it.liu.se:29418/andal699/laravel.git', source => 'ssh://git@gitlab.it.liu.se:29418/skadereg/laravel.git',
user => 'apache', user => 'apache',
group => 'skadereg', group => 'skadereg',
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment