paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-18 21:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

puppet: Abstract out nginx package.

Browse Source
This commit is contained in:
rht
2019-01-05 00:02:24 +00:00
committed by Tim Abbott
parent 5424fca168
commit 43fdb00fc7
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/zulip/manifests/app_frontend.pp
View File

@@ -7,7 +7,7 @@ class zulip::app_frontend {
$no_serve_uploads = zulipconf('application_server', 'no_serve_uploads', undef) $no_serve_uploads = zulipconf('application_server', 'no_serve_uploads', undef)
file { '/etc/nginx/sites-available/zulip-enterprise': file { '/etc/nginx/sites-available/zulip-enterprise':
ensure => file, ensure => file,
require => Package['nginx-full'], require => Package[$zulip::app_frontend_base::nginx],
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
@@ -23,7 +23,7 @@ class zulip::app_frontend {
} }
file { '/etc/nginx/sites-enabled/zulip-enterprise': file { '/etc/nginx/sites-enabled/zulip-enterprise':
ensure => 'link', ensure => 'link',
require => Package['nginx-full'], require => Package[$zulip::app_frontend_base::nginx],
target => '/etc/nginx/sites-available/zulip-enterprise', target => '/etc/nginx/sites-available/zulip-enterprise',
notify => Service['nginx'], notify => Service['nginx'],
} }

11
puppet/zulip/manifests/app_frontend_base.pp
View File

@@ -15,8 +15,13 @@ class zulip::app_frontend_base {
'redhat' => 'nagios-plugins', 'redhat' => 'nagios-plugins',
} }
$nginx = $::osfamily ? {
'debian' => 'nginx-full',
'redhat' => 'nginx',
}
file { '/etc/nginx/zulip-include/app': file { '/etc/nginx/zulip-include/app':
require => Package['nginx-full'], require => Package[$nginx],
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
@@ -24,7 +29,7 @@ class zulip::app_frontend_base {
notify => Service['nginx'], notify => Service['nginx'],
} }
file { '/etc/nginx/zulip-include/upstreams': file { '/etc/nginx/zulip-include/upstreams':
require => Package['nginx-full'], require => Package[$nginx],
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
@@ -32,7 +37,7 @@ class zulip::app_frontend_base {
notify => Service['nginx'], notify => Service['nginx'],
} }
file { '/etc/nginx/zulip-include/uploads.types': file { '/etc/nginx/zulip-include/uploads.types':
require => Package['nginx-full'], require => Package[$nginx],
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',

7
puppet/zulip/manifests/localhost_sso.pp
View File

@@ -1,7 +1,12 @@
class zulip::localhost_sso { class zulip::localhost_sso {
$nginx = $::osfamily ? {
'debian' => 'nginx-full',
'redhat' => 'nginx',
}
file { '/etc/nginx/zulip-include/app.d/external-sso.conf': file { '/etc/nginx/zulip-include/app.d/external-sso.conf':
ensure => file, ensure => file,
require => Package['nginx-full'], require => Package[$nginx],
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',

2
puppet/zulip/manifests/thumbor.pp
View File

@@ -14,7 +14,7 @@ class zulip::thumbor {
file { '/etc/nginx/zulip-include/app.d/thumbor.conf': file { '/etc/nginx/zulip-include/app.d/thumbor.conf':
ensure => file, ensure => file,
require => Package['nginx-full'], require => Package[$zulip::nginx::nginx],
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',

4
puppet/zulip/manifests/zulip_org.pp
View File

@@ -4,7 +4,7 @@ class zulip::zulip_org {
file { '/etc/nginx/sites-available/zulip-org': file { '/etc/nginx/sites-available/zulip-org':
ensure => file, ensure => file,
require => Package['nginx-full'], require => Package[$zulip::nginx::nginx],
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
@@ -14,7 +14,7 @@ class zulip::zulip_org {
file { '/etc/nginx/sites-enabled/zulip-org': file { '/etc/nginx/sites-enabled/zulip-org':
ensure => 'link', ensure => 'link',
require => Package['nginx-full'], require => Package[$zulip::nginx::nginx],
target => '/etc/nginx/sites-available/zulip-org', target => '/etc/nginx/sites-available/zulip-org',
notify => Service['nginx'], notify => Service['nginx'],
} }