Skip to content

Commit 934b923

Browse files
committed
Remove hard tabs
1 parent d8dbfb3 commit 934b923

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

manifests/passenger.pp

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,19 @@
6161
if $::osfamily == 'redhat' {
6262

6363
file{"${puppet_ssldir}/ca":
64-
ensure => directory,
65-
owner => $::puppet::params::puppet_user,
66-
group => $::puppet::params::puppet_group,
67-
mode => '0770',
68-
before => Exec['Certificate_Check'],
64+
ensure => directory,
65+
owner => $::puppet::params::puppet_user,
66+
group => $::puppet::params::puppet_group,
67+
mode => '0770',
68+
before => Exec['Certificate_Check'],
6969
}
7070

7171
file{"${puppet_ssldir}/ca/requests":
72-
ensure => directory,
73-
owner => $::puppet::params::puppet_user,
74-
group => $::puppet::params::puppet_group,
75-
mode => '0750',
76-
before => Exec['Certificate_Check'],
72+
ensure => directory,
73+
owner => $::puppet::params::puppet_user,
74+
group => $::puppet::params::puppet_group,
75+
mode => '0750',
76+
before => Exec['Certificate_Check'],
7777
}
7878

7979
}
@@ -108,25 +108,25 @@
108108
}
109109

110110
apache::vhost { "puppet-${certname}":
111-
port => $puppet_passenger_port,
112-
priority => '40',
113-
docroot => $puppet_docroot,
114-
serveradmin => $apache_serveradmin,
115-
servername => $certname,
116-
ssl => true,
117-
ssl_cert => "${puppet_ssldir}/certs/${certname}.pem",
118-
ssl_key => "${puppet_ssldir}/private_keys/${certname}.pem",
119-
ssl_chain => "${puppet_ssldir}/ca/ca_crt.pem",
120-
ssl_ca => "${puppet_ssldir}/ca/ca_crt.pem",
121-
ssl_crl => "${puppet_ssldir}/ca/ca_crl.pem",
122-
ssl_protocol => 'ALL -SSLv2 -SSLv3',
123-
ssl_cipher => 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK',
111+
port => $puppet_passenger_port,
112+
priority => '40',
113+
docroot => $puppet_docroot,
114+
serveradmin => $apache_serveradmin,
115+
servername => $certname,
116+
ssl => true,
117+
ssl_cert => "${puppet_ssldir}/certs/${certname}.pem",
118+
ssl_key => "${puppet_ssldir}/private_keys/${certname}.pem",
119+
ssl_chain => "${puppet_ssldir}/ca/ca_crt.pem",
120+
ssl_ca => "${puppet_ssldir}/ca/ca_crt.pem",
121+
ssl_crl => "${puppet_ssldir}/ca/ca_crl.pem",
122+
ssl_protocol => 'ALL -SSLv2 -SSLv3',
123+
ssl_cipher => 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK',
124124
ssl_honorcipherorder => 'On',
125-
ssl_verify_client => 'optional',
126-
ssl_verify_depth => '1',
127-
ssl_options => ['+StdEnvVars', '+ExportCertData'],
128-
rack_base_uris => '/',
129-
directories => [
125+
ssl_verify_client => 'optional',
126+
ssl_verify_depth => '1',
127+
ssl_options => ['+StdEnvVars', '+ExportCertData'],
128+
rack_base_uris => '/',
129+
directories => [
130130
{
131131
path => $puppet_docroot,
132132
},
@@ -135,7 +135,7 @@
135135
options => 'None',
136136
},
137137
],
138-
require => [ File['/etc/puppet/rack/config.ru'], File[$puppet_conf] ],
138+
require => [ File['/etc/puppet/rack/config.ru'], File[$puppet_conf] ],
139139
}
140140

141141
#Hack to add extra passenger configurations for puppetmaster

0 commit comments

Comments
 (0)