[MediaWiki-commits] [Gerrit] dynamicproxy: resource attributes quote - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: dynamicproxy: resource attributes quote
......................................................................


dynamicproxy: resource attributes quote

bug: T91908
Change-Id: Ie610e23d1a1d45e86bea3246d5d1aa4c18fc5f48
---
M modules/dynamicproxy/manifests/api.pp
M modules/dynamicproxy/manifests/init.pp
2 files changed, 22 insertions(+), 22 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/dynamicproxy/manifests/api.pp 
b/modules/dynamicproxy/manifests/api.pp
index 37f948a..6b6c875 100644
--- a/modules/dynamicproxy/manifests/api.pp
+++ b/modules/dynamicproxy/manifests/api.pp
@@ -4,12 +4,12 @@
     }
 
     package { 'python-flask':
-        ensure  => 'latest',
+        ensure  => latest,
         require => Class['misc::labsdebrepo'],
     }
 
     package { ['python-invisible-unicorn', 'python-flask-sqlalchemy', 'uwsgi', 
'uwsgi-plugin-python']:
-        ensure  => 'present',
+        ensure  => present,
         require => Package['python-flask'],
     }
 
@@ -37,13 +37,13 @@
     }
 
     file { '/etc/dynamicproxy-api':
-            ensure => 'directory',
+            ensure => directory,
             owner  => 'www-data',
             group  => 'www-data',
     }
 
     file { '/data/project/backup':
-            ensure => 'directory',
+            ensure => directory,
             owner  => 'root',
             group  => 'root',
             mode   => '0755',
@@ -67,15 +67,15 @@
     cron { 'proxydb-bak':
             ensure  => present,
             user    => 'root',
-            hour    => 1,
-            minute  => 0,
+            hour    => '1',
+            minute  => '0',
             command => '/usr/local/sbin/proxydb-bak.sh > /dev/null 2>&1',
             require => File['/data/project/backup'],
     }
 
     # Create initial db file if it doesn't exist, but don't clobber if it does.
     file { '/etc/dynamicproxy-api/data.db':
-        ensure  => 'file',
+        ensure  => file,
         source  => 'puppet:///modules/dynamicproxy/initial-data.db',
         replace => false,
         require => File['/etc/dynamicproxy-api'],
diff --git a/modules/dynamicproxy/manifests/init.pp 
b/modules/dynamicproxy/manifests/init.pp
index e618238..9fcffac 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -15,11 +15,11 @@
 class dynamicproxy (
     $ssl_settings,
     $resolver,
-    $redis_maxmemory='512MB',
-    $ssl_certificate_name=false,
-    $notfound_servers=[],
-    $luahandler='domainproxy',
-    $set_xff=false,
+    $redis_maxmemory      = '512MB',
+    $ssl_certificate_name = false,
+    $notfound_servers     = [],
+    $luahandler           = 'domainproxy',
+    $set_xff              = false,
 ) {
     class { '::redis':
         persist       => 'aof',
@@ -42,24 +42,24 @@
 
     file { '/etc/logrotate.d/nginx':
         ensure => present,
-        owner  => root,
-        group  => root,
+        owner  => 'root',
+        group  => 'root',
         mode   => '0444',
         source => 'puppet:///modules/dynamicproxy/logrotate',
     }
 
     file { '/etc/nginx/nginx.conf':
-        ensure  => 'file',
+        ensure  => file,
         content => template('dynamicproxy/nginx.conf'),
         require => Package['nginx-common'],
-        notify  => Service['nginx']
+        notify  => Service['nginx'],
     }
 
     file { '/etc/security/limits.conf':
-        ensure  => 'file',
+        ensure  => file,
         source  => 'puppet:///modules/dynamicproxy/limits.conf',
         require => Package['nginx-common'],
-        notify  => Service['nginx']
+        notify  => Service['nginx'],
     }
 
     nginx::site { 'proxy':
@@ -67,24 +67,24 @@
     }
 
     file { '/etc/nginx/lua':
-        ensure  => 'directory',
+        ensure  => directory,
         require => Package['nginx-extras'],
     }
 
     file { "/etc/nginx/lua/${luahandler}.lua":
-        ensure  => 'file',
+        ensure  => file,
         source  => "puppet:///modules/dynamicproxy/${luahandler}.lua",
         require => File['/etc/nginx/lua'],
         notify  => Service['nginx'],
     }
 
     file { '/etc/nginx/lua/resty':
-        ensure  => 'directory',
+        ensure  => directory,
         require => File['/etc/nginx/lua'],
     }
 
     file { '/etc/nginx/lua/resty/redis.lua':
-        ensure  => 'file',
+        ensure  => file,
         require => File['/etc/nginx/lua/resty'],
         source  => 'puppet:///modules/dynamicproxy/redis.lua',
     }

-- 
To view, visit https://gerrit.wikimedia.org/r/195627
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie610e23d1a1d45e86bea3246d5d1aa4c18fc5f48
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits