diff --git a/modules/insidan/manifests/openproject.pp b/modules/insidan/manifests/openproject.pp index 1574de364f413ec6b101bdcb9190a5835118746e..9221e53cc8f3ffbb45c3371979472f61a9017b71 100644 --- a/modules/insidan/manifests/openproject.pp +++ b/modules/insidan/manifests/openproject.pp @@ -1,9 +1,8 @@ define insidan::openproject ( - $logo = "holgerlogo.png", - $url = "insidan.holgerspexet.se", + $logo = 'holgerlogo.png', + $url = 'insidan.holgerspexet.se', ) { -# class insidan::openproject { include nginx # insidan::certificates { 'openprojectcert': # url => $url, # email => 'hugo.hornquist@liuformulastudent.se', # TODO NOOOOOOO @@ -12,13 +11,13 @@ define insidan::openproject ( exec { 'install openproject repos': command => 'bash -e wget -qO- https://dl.packager.io/srv/opf/openproject/key | apt-key add -; sudo wget -O /etc/apt/sources.list.d/openproject.list https://dl.packager.io/srv/opf/openproject/stable/10/installer/ubuntu/18.04.repo', creates => '/etc/apt/sources.list.d/openproject.list', - path => ['/usr/bin', '/usr/sbin', '/bin'], - }~> - exec { 'apt update': + path => ['/usr/bin', '/usr/sbin', '/bin'], + } + ~> exec { 'apt update': command => 'apt update', - path => ['/usr/bin', '/usr/sbin', '/bin'], + path => ['/usr/bin', '/usr/sbin', '/bin'], } - package { 'openproject' : + ~> package { 'openproject' : ensure => installed, # Here, someone MUST run `openproject configure`. At least until we # configure it via puppet... @@ -30,25 +29,24 @@ define insidan::openproject ( } file { '/pg_dump': - ensure => directory, - owner => 'postgres', + ensure => directory, + owner => 'postgres', require => Package['postgresql'], } file { '/opt/pg_dump.sh': ensure => file, - mode => '755', + mode => '0755', source => 'puppet:///modules/insidan/pg_dump.sh', } cron { 'pg_dump openproject': - ensure => present, + ensure => present, command => '/opt/pg_dump.sh', - user => root, - minute => 45, + user => root, + minute => 45, require => [ File['/opt/pg_dump.sh'], File['/pg_dump'] ] } - # Setup Nginx @@ -66,10 +64,10 @@ define insidan::openproject ( # ssl_key => "/etc/letsencrypt/live/${url}/privkey.pem", # Forward secret stuff - proxy_set_header => [ "X-Forwarded-Proto \$scheme", + proxy_set_header => [ "X-Forwarded-Proto \$scheme", "X-Forwarded-Host \$host", "X-Forwarded-Server \$host", - "X-Forwarded-For \$proxy_add_x_forwarded_for", ], + "X-Forwarded-For \$proxy_add_x_forwarded_for", ], # Set the paranoia level to 'high'. ssl_protocols => 'TLSv1.2', ssl_ciphers => 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256',