Dzahn has submitted this change and it was merged.
Change subject: limn: minor lint and Resource attributes quoting
......................................................................
limn: minor lint and Resource attributes quoting
bug: T91908
Change-Id: I72975b079d184809de61800ebfd42a91aee971b0
---
M modules/limn/manifests/init.pp
M modules/limn/manifests/instance.pp
M modules/limn/manifests/instance/proxy.pp
3 files changed, 126 insertions(+), 126 deletions(-)
Approvals:
Gage: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/limn/manifests/init.pp b/modules/limn/manifests/init.pp
index e1fe163..d6abb7e 100644
--- a/modules/limn/manifests/init.pp
+++ b/modules/limn/manifests/init.pp
@@ -11,48 +11,48 @@
# $log_directory - Default path to Limn server logs. Default: /var/log/limn
#
class limn(
- $var_directory = '/var/lib/limn',
- $log_directory = '/var/log/limn')
-{
- $user = 'limn'
- $group = 'limn'
+ $var_directory = '/var/lib/limn',
+ $log_directory = '/var/log/limn'
+){
+ $user = 'limn'
+ $group = 'limn'
- # Make sure nodejs is installed.
- require_package('nodejs')
+ # Make sure nodejs is installed.
+ require_package('nodejs')
- group { $group:
- ensure => present,
- system => true,
- }
+ group { $group:
+ ensure => present,
+ system => true,
+ }
- user { $user:
- ensure => present,
- gid => $group,
- home => $var_directory,
- managehome => false,
- system => true,
- require => Group[$group],
- }
+ user { $user:
+ ensure => present,
+ gid => $group,
+ home => $var_directory,
+ managehome => false,
+ system => true,
+ require => Group[$group],
+ }
- # Default limn containing data directory.
- # Instances default to storing data in
- # $var_directory/$name
- file { $var_directory:
- ensure => 'directory',
- owner => $user,
- group => $group,
- mode => '0755',
- require => [User[$user], Group[$group]],
- }
+ # Default limn containing data directory.
+ # Instances default to storing data in
+ # $var_directory/$name
+ file { $var_directory:
+ ensure => directory,
+ owner => $user,
+ group => $group,
+ mode => '0755',
+ require => [User[$user], Group[$group]],
+ }
- # Default limn log directory.
- # Instances will log to
- # $log_directory/limn-$name.log
- file { $log_directory:
- ensure => 'directory',
- owner => $user,
- group => $group,
- mode => '0755',
- require => [User[$user], Group[$group]],
- }
+ # Default limn log directory.
+ # Instances will log to
+ # $log_directory/limn-$name.log
+ file { $log_directory:
+ ensure => directory,
+ owner => $user,
+ group => $group,
+ mode => '0755',
+ require => [User[$user], Group[$group]],
+ }
}
diff --git a/modules/limn/manifests/instance.pp
b/modules/limn/manifests/instance.pp
index 284b98f..100a2cb 100644
--- a/modules/limn/manifests/instance.pp
+++ b/modules/limn/manifests/instance.pp
@@ -10,83 +10,83 @@
# $ensure - present|absent. Default: present
#
define limn::instance (
- $port = 8081,
- $environment = 'production',
- $base_directory = '/usr/local/share/limn',
- $var_directory = "/var/lib/limn/${name}",
- $log_file = "/var/log/limn/limn-${name}.log",
- $ensure = 'present')
-{
- require limn
+ $port = '8081',
+ $environment = 'production',
+ $base_directory = '/usr/local/share/limn',
+ $var_directory = "/var/lib/limn/${name}",
+ $log_file = "/var/log/limn/limn-${name}.log",
+ $ensure = 'present'
+){
+ require limn
- validate_ensure($ensure)
+ validate_ensure($ensure)
- if !defined(File[$base_directory]) {
- file { $base_directory:
- ensure => 'directory',
- owner => $limn::user,
- group => $limn::group,
- mode => '0775',
+ if !defined(File[$base_directory]) {
+ file { $base_directory:
+ ensure => directory,
+ owner => $limn::user,
+ group => $limn::group,
+ mode => '0775',
+ }
}
- }
- file { $var_directory:
- ensure => 'directory',
- owner => $limn::user,
- group => $limn::group,
- mode => '0775',
- }
+ file { $var_directory:
+ ensure => directory,
+ owner => $limn::user,
+ group => $limn::group,
+ mode => '0775',
+ }
- # The upstart init conf will start server.co
- # logging to this file.
- file { $log_file:
- ensure => 'file',
- owner => $limn::user,
- group => $limn::group,
- mode => '0775',
- }
+ # The upstart init conf will start server.co
+ # logging to this file.
+ file { $log_file:
+ ensure => file,
+ owner => $limn::user,
+ group => $limn::group,
+ mode => '0775',
+ }
- # symlink $base_directory/var/{css,js,vendor}
- # in $var_directory
- file { "${var_directory}/css":
- ensure => ensure_link($ensure),
- target => "${base_directory}/var/css",
- }
- file { "${var_directory}/js":
+ # symlink $base_directory/var/{css,js,vendor}
+ # in $var_directory
+ file { "${var_directory}/css":
+ ensure => ensure_link($ensure),
+ target => "${base_directory}/var/css",
+ }
+ file { "${var_directory}/js":
ensure => ensure_link($ensure),
target => "${base_directory}/var/js",
- }
- file { "${var_directory}/vendor":
- ensure => ensure_link($ensure),
- target => "${base_directory}/var/vendor",
- }
+ }
+ file { "${var_directory}/vendor":
+ ensure => ensure_link($ensure),
+ target => "${base_directory}/var/vendor",
+ }
- # Install an upstart init file for this limn server instance.
- file { "/etc/init/limn-${name}.conf":
- ensure => $ensure,
- content => template('limn/init-limn.conf.erb'),
- owner => 'root',
- group => 'root',
- mode => '0444',
- require => [File[$var_directory], File[$log_file]],
- }
+ # Install an upstart init file for this limn server instance.
+ file { "/etc/init/limn-${name}.conf":
+ ensure => $ensure,
+ content => template('limn/init-limn.conf.erb'),
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ require => [File[$var_directory], File[$log_file]],
+ }
- # Symlink an /etc/init.d script to upstart-job
- # for SysV compatibility.
- $sysv_ensure = $ensure ? {
- present => 'link',
- default => 'absent',
- }
- file { "/etc/init.d/limn-${name}":
- ensure => $sysv_ensure,
- target => '/lib/init/upstart-job',
- require => File["/etc/init/limn-${name}.conf"],
- }
+ # Symlink an /etc/init.d script to upstart-job
+ # for SysV compatibility.
+ $sysv_ensure = $ensure ? {
+ present => link,
+ default => absent,
+ }
+ file { "/etc/init.d/limn-${name}":
+ ensure => $sysv_ensure,
+ target => '/lib/init/upstart-job',
+ require => File["/etc/init/limn-${name}.conf"],
+ }
- # Start the service.
- service { "limn-${name}":
- ensure => ensure_service($ensure),
- provider => 'upstart',
- subscribe => File["/etc/init/limn-${name}.conf"],
- }
+ # Start the service.
+ service { "limn-${name}":
+ ensure => ensure_service($ensure),
+ provider => 'upstart',
+ subscribe => File["/etc/init/limn-${name}.conf"],
+ }
}
diff --git a/modules/limn/manifests/instance/proxy.pp
b/modules/limn/manifests/instance/proxy.pp
index 0e89c78..acdaf32 100644
--- a/modules/limn/manifests/instance/proxy.pp
+++ b/modules/limn/manifests/instance/proxy.pp
@@ -17,23 +17,23 @@
# $site_template - Template for Apache conf. Default:
limn/vhost-limn-proxy.conf.erb.
#
define limn::instance::proxy (
- $port = 80,
- $limn_host = '127.0.0.1',
- $limn_port = '8081',
- $document_root = '/usr/local/share/limn/var',
- $server_name = "${name}.${::domain}",
- $server_aliases = '',
- $site_template = 'limn/vhost-limn-proxy.conf.erb')
-{
- # Configure the Apache Limn instance proxy VirtualHost.
- $priority = 10
- file { "${priority}-limn-${name}.conf":
- path => "/etc/apache2/sites-enabled/${priority}-limn-${name}.conf",
- content => template($site_template),
- owner => 'root',
- group => 'root',
- mode => '0444',
- require => Package['apache2'],
- notify => Service['apache2'],
- }
+ $port = '80',
+ $limn_host = '127.0.0.1',
+ $limn_port = '8081',
+ $document_root = '/usr/local/share/limn/var',
+ $server_name = "${name}.${::domain}",
+ $server_aliases = '',
+ $site_template = 'limn/vhost-limn-proxy.conf.erb',
+){
+ # Configure the Apache Limn instance proxy VirtualHost.
+ $priority = 10
+ file { "${priority}-limn-${name}.conf":
+ path => "/etc/apache2/sites-enabled/${priority}-limn-${name}.conf",
+ content => template($site_template),
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ require => Package['apache2'],
+ notify => Service['apache2'],
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/195616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72975b079d184809de61800ebfd42a91aee971b0
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Gage <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
