Skip to content

Commit 3449594

Browse files
committed
puppet-lint: autofix
1 parent f7b4c6a commit 3449594

13 files changed

Lines changed: 20 additions & 42 deletions

examples/jira_mysql_install.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
node default {
2-
32
class { 'mysql::server':
43
root_password => 'strongpassword',
54
}
@@ -20,5 +19,4 @@
2019
}
2120

2221
include jira::facts
23-
2422
}

examples/jira_mysql_nativessl_install.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
node default {
2-
32
$cert = hiera('cert')
43
$key = hiera('key')
54

@@ -57,5 +56,4 @@
5756
}
5857

5958
include jira::facts
60-
6159
}

examples/jira_postgres_install.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
node default {
2-
32
class { 'postgresql::globals':
43
manage_package_repo => true,
54
version => '9.3',
@@ -17,5 +16,4 @@
1716
}
1817

1918
include jira::facts
20-
2119
}

examples/jira_postgres_nginx_install.pp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
node default {
2-
32
class { 'nginx': }
43

54
-> class { 'postgresql::globals':
@@ -27,12 +26,12 @@
2726

2827
nginx::resource::upstream { 'jira':
2928
ensure => present,
30-
members => [ 'localhost:8080' ],
29+
members => ['localhost:8080'],
3130
}
3231

3332
nginx::resource::vhost { 'jira_vhost':
3433
ensure => present,
35-
server_name => [ $facts['networking']['ip'], $facts['networking']['fqdn'], $facts['networking']['hostname'] ],
34+
server_name => [$facts['networking']['ip'], $facts['networking']['fqdn'], $facts['networking']['hostname']],
3635
listen_port => '80',
3736
proxy => 'http://jira',
3837
proxy_read_timeout => '300',
@@ -44,5 +43,4 @@
4443
'proxy_redirect' => 'off',
4544
},
4645
}
47-
4846
}

examples/jira_postgres_nginx_ssl_install.pp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
node default {
2-
32
class { 'nginx': }
43

54
-> class { 'postgresql::globals':
@@ -27,12 +26,12 @@
2726

2827
nginx::resource::upstream { 'jira':
2928
ensure => present,
30-
members => [ 'localhost:8080' ],
29+
members => ['localhost:8080'],
3130
}
3231

3332
nginx::resource::vhost { 'jira_vhost':
3433
ensure => present,
35-
server_name => [ $facts['networking']['ip'], $facts['networking']['fqdn'], $facts['networking']['hostname'] ],
34+
server_name => [$facts['networking']['ip'], $facts['networking']['fqdn'], $facts['networking']['hostname']],
3635
proxy => 'http://jira',
3736
proxy_read_timeout => '300',
3837
rewrite_to_https => true,
@@ -47,5 +46,4 @@
4746
'proxy_redirect' => 'off',
4847
},
4948
}
50-
5149
}

manifests/config.pp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
# limitations under the License.
1515
# -----------------------------------------------------------------------------
1616
class jira::config inherits jira {
17-
1817
File {
1918
owner => $jira::user,
2019
group => $jira::group,
@@ -59,7 +58,7 @@
5958
-> file { "${jira::homedir}/dbconfig.xml":
6059
content => template("jira/dbconfig.${jira::db}.xml.erb"),
6160
mode => '0600',
62-
require => [ Class['jira::install'],File[$jira::homedir] ],
61+
require => [Class['jira::install'],File[$jira::homedir]],
6362
notify => Class['jira::service'],
6463
}
6564

@@ -91,17 +90,16 @@
9190
file { "${jira::homedir}/jira-config.properties":
9291
content => template('jira/jira-config.properties.erb'),
9392
mode => '0600',
94-
require => [ Class['jira::install'],File[$jira::homedir] ],
93+
require => [Class['jira::install'],File[$jira::homedir]],
9594
notify => Class['jira::service'],
9695
}
9796

9897
if $jira::datacenter {
9998
file { "${jira::homedir}/cluster.properties":
10099
content => template('jira/cluster.properties.erb'),
101100
mode => '0600',
102-
require => [ Class['jira::install'],File[$jira::homedir] ],
101+
require => [Class['jira::install'],File[$jira::homedir]],
103102
notify => Class['jira::service'],
104103
}
105104
}
106-
107105
}

manifests/facts.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
},
2727
# lint:endignore
2828
) inherits jira::params {
29-
3029
# Puppet Enterprise supplies its own ruby version if your using it.
3130
# A modern ruby version is required to run the executable fact
3231
if $facts['puppetversion'] =~ /Puppet Enterprise/ {
@@ -60,5 +59,4 @@
6059
content => template('jira/facts.rb.erb'),
6160
mode => '0500',
6261
}
63-
6462
}

manifests/init.pp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,13 @@
157157
Integer $session_validationinterval = 5,
158158
String $session_lastvalidation = 'session.lastvalidation',
159159
) inherits jira::params {
160-
161160
if $datacenter and !$shared_homedir {
162161
fail("\$shared_homedir must be set when \$datacenter is true")
163162
}
164163

165164
if $tomcat_redirect_https_port {
166165
unless ($tomcat_native_ssl) {
167-
fail('You need to set native_ssl to true when using tomcat_redirect_https_port')
166+
fail('You need to set native_ssl to true when using tomcat_redirect_https_port')
168167
}
169168
}
170169

@@ -263,7 +262,7 @@
263262
}
264263
}
265264

266-
$merged_jira_config_properties = merge({'jira.websudo.is.disabled' => !$enable_secure_admin_sessions}, $jira_config_properties)
265+
$merged_jira_config_properties = merge( { 'jira.websudo.is.disabled' => !$enable_secure_admin_sessions }, $jira_config_properties)
267266

268267
if $javahome == undef {
269268
fail('You need to specify a value for javahome')

manifests/install.pp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
# limitations under the License.
1515
# -----------------------------------------------------------------------------
1616
class jira::install {
17-
1817
include 'archive'
1918

2019
if $jira::manage_user {
@@ -32,7 +31,6 @@
3231
managehome => true,
3332
uid => $jira::uid,
3433
gid => $jira::gid,
35-
3634
}
3735
}
3836

@@ -94,7 +92,7 @@
9492
require => [
9593
File[$jira::installdir],
9694
User[$jira::user],
97-
File[$jira::extractdir] ],
95+
File[$jira::extractdir]],
9896
}
9997
}
10098
'archive': {

manifests/mysql_connector.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
$installdir = $jira::mysql_connector_install,
77
$download_url = $jira::mysql_connector_url,
88
) {
9-
109
require staging
1110

1211
$file = "${product}-${version}.${format}"
@@ -34,5 +33,4 @@
3433
ensure => link,
3534
target => "${installdir}/${product}-${version}/${product}-${version}-bin.jar",
3635
}
37-
3836
}

0 commit comments

Comments
 (0)