From e103c2ff2deb0a39cf03eeb0e005d2bcd7f8e5fd Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 22 Apr 2018 23:30:21 -0700 Subject: [PATCH] puppet: Switch to modern quoted, octal file modes. This is one of the prerequisite tasks for Puppet 4 support. Constructed using puppet-lint. --- puppet/zulip/manifests/apache_sso.pp | 4 +-- puppet/zulip/manifests/app_frontend.pp | 8 ++--- puppet/zulip/manifests/app_frontend_base.pp | 22 +++++++------- puppet/zulip/manifests/app_frontend_once.pp | 12 ++++---- puppet/zulip/manifests/base.pp | 12 ++++---- puppet/zulip/manifests/camo.pp | 2 +- puppet/zulip/manifests/localhost_camo.pp | 2 +- puppet/zulip/manifests/localhost_sso.pp | 2 +- puppet/zulip/manifests/memcached.pp | 2 +- puppet/zulip/manifests/nagios.pp | 2 +- puppet/zulip/manifests/nginx.pp | 12 ++++---- puppet/zulip/manifests/postfix_localmail.pp | 10 +++---- puppet/zulip/manifests/postgres_appdb_base.pp | 10 +++---- .../zulip/manifests/postgres_appdb_tuned.pp | 6 ++-- puppet/zulip/manifests/postgres_common.pp | 6 ++-- puppet/zulip/manifests/rabbit.pp | 12 ++++---- puppet/zulip/manifests/redis.pp | 2 +- puppet/zulip/manifests/supervisor.pp | 2 +- puppet/zulip/manifests/zulip_org.pp | 2 +- puppet/zulip_ops/manifests/apache.pp | 10 +++---- puppet/zulip_ops/manifests/app_frontend.pp | 14 ++++----- puppet/zulip_ops/manifests/base.pp | 30 +++++++++---------- puppet/zulip_ops/manifests/git.pp | 2 +- puppet/zulip_ops/manifests/loadbalancer.pp | 10 +++---- puppet/zulip_ops/manifests/munin.pp | 6 ++-- puppet/zulip_ops/manifests/nagios.pp | 18 +++++------ puppet/zulip_ops/manifests/postgres_appdb.pp | 4 +-- puppet/zulip_ops/manifests/postgres_master.pp | 4 +-- puppet/zulip_ops/manifests/postgres_slave.pp | 4 +-- .../zulip_ops/manifests/prod_app_frontend.pp | 4 +-- puppet/zulip_ops/manifests/redis.pp | 2 +- .../manifests/staging_app_frontend.pp | 2 +- puppet/zulip_ops/manifests/zmirror.pp | 8 ++--- .../zulip_ops/manifests/zmirror_personals.pp | 6 ++-- 34 files changed, 127 insertions(+), 127 deletions(-) diff --git a/puppet/zulip/manifests/apache_sso.pp b/puppet/zulip/manifests/apache_sso.pp index 0d2fb25d1f..6bef668980 100644 --- a/puppet/zulip/manifests/apache_sso.pp +++ b/puppet/zulip/manifests/apache_sso.pp @@ -17,7 +17,7 @@ class zulip::apache_sso { ensure => file, owner => "root", group => "root", - mode => 640, + mode => '0640', source => "puppet:///modules/zulip/apache/ports.conf", } @@ -26,7 +26,7 @@ class zulip::apache_sso { require => Package[apache2], owner => "root", group => "root", - mode => 640, + mode => '0640', source => "puppet:///modules/zulip/apache/sites/", } diff --git a/puppet/zulip/manifests/app_frontend.pp b/puppet/zulip/manifests/app_frontend.pp index 2e53d89c2f..b317e443ff 100644 --- a/puppet/zulip/manifests/app_frontend.pp +++ b/puppet/zulip/manifests/app_frontend.pp @@ -8,7 +8,7 @@ class zulip::app_frontend { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/nginx/sites-available/zulip-enterprise", notify => Service["nginx"], } @@ -16,7 +16,7 @@ class zulip::app_frontend { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/logrotate/zulip", } file { '/etc/nginx/sites-enabled/zulip-enterprise': @@ -31,7 +31,7 @@ class zulip::app_frontend { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/cron.d/certbot-renew", } @@ -40,7 +40,7 @@ class zulip::app_frontend { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/cron.d/restart-zulip", } } diff --git a/puppet/zulip/manifests/app_frontend_base.pp b/puppet/zulip/manifests/app_frontend_base.pp index 91e0210039..b95918062b 100644 --- a/puppet/zulip/manifests/app_frontend_base.pp +++ b/puppet/zulip/manifests/app_frontend_base.pp @@ -19,7 +19,7 @@ class zulip::app_frontend_base { require => Package["nginx-full"], owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/nginx/zulip-include-frontend/app", notify => Service["nginx"], } @@ -27,7 +27,7 @@ class zulip::app_frontend_base { require => Package["nginx-full"], owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/nginx/zulip-include-frontend/upstreams", notify => Service["nginx"], } @@ -35,7 +35,7 @@ class zulip::app_frontend_base { require => Package["nginx-full"], owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/nginx/zulip-include-frontend/uploads.types", notify => Service["nginx"], } @@ -43,7 +43,7 @@ class zulip::app_frontend_base { ensure => directory, owner => "root", group => "root", - mode => 755, + mode => '0755', } $loadbalancers = split(zulipconf("loadbalancer", "ips", ""), ",") @@ -52,7 +52,7 @@ class zulip::app_frontend_base { require => File["/etc/nginx/zulip-include/app.d"], owner => "root", group => "root", - mode => 644, + mode => '0644', content => template("zulip/accept-loadbalancer.conf.template.erb"), notify => Service["nginx"], } @@ -77,7 +77,7 @@ class zulip::app_frontend_base { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', content => template("zulip/supervisor/zulip.conf.template.erb"), notify => Service["supervisor"], } @@ -89,7 +89,7 @@ class zulip::app_frontend_base { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', content => template("zulip/uwsgi.ini.template.erb"), notify => Service["supervisor"], } @@ -98,7 +98,7 @@ class zulip::app_frontend_base { ensure => directory, owner => "zulip", group => "zulip", - mode => 755, + mode => '0755', } file { '/home/zulip/logs': ensure => 'directory', @@ -119,13 +119,13 @@ class zulip::app_frontend_base { ensure => directory, owner => "zulip", group => "zulip", - mode => 755, + mode => '0755', } file { "/srv/zulip-emoji-cache": ensure => directory, owner => "zulip", group => "zulip", - mode => 755, + mode => '0755', } file { "/etc/cron.d/email-mirror": ensure => absent, @@ -136,7 +136,7 @@ class zulip::app_frontend_base { purge => true, owner => "root", group => "root", - mode => 755, + mode => '0755', source => "puppet:///modules/zulip/nagios_plugins/zulip_app_frontend", } } diff --git a/puppet/zulip/manifests/app_frontend_once.pp b/puppet/zulip/manifests/app_frontend_once.pp index f76273ba25..fd31f53867 100644 --- a/puppet/zulip/manifests/app_frontend_once.pp +++ b/puppet/zulip/manifests/app_frontend_once.pp @@ -6,7 +6,7 @@ class zulip::app_frontend_once { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/cron.d/send-digest-emails", } @@ -14,7 +14,7 @@ class zulip::app_frontend_once { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/cron.d/update-analytics-counts", } @@ -22,7 +22,7 @@ class zulip::app_frontend_once { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/cron.d/check-analytics-state", } @@ -30,7 +30,7 @@ class zulip::app_frontend_once { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/cron.d/soft-deactivate-users", } @@ -38,7 +38,7 @@ class zulip::app_frontend_once { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/cron.d/calculate-first-visible-message-id", } @@ -46,7 +46,7 @@ class zulip::app_frontend_once { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/cron.d/clearsessions", } } diff --git a/puppet/zulip/manifests/base.pp b/puppet/zulip/manifests/base.pp index cdd5fb2ad0..b5a697ba19 100644 --- a/puppet/zulip/manifests/base.pp +++ b/puppet/zulip/manifests/base.pp @@ -76,14 +76,14 @@ class zulip::base { file { '/etc/zulip': ensure => 'directory', - mode => 644, + mode => '0644', owner => 'zulip', group => 'zulip', } file { '/etc/security/limits.conf': ensure => file, - mode => 640, + mode => '0640', owner => "root", group => "root", source => 'puppet:///modules/zulip/limits.conf', @@ -93,21 +93,21 @@ class zulip::base { file { '/var/lib/nagios_state/': ensure => directory, group => 'zulip', - mode => 774, + mode => '0774', } file { '/var/log/zulip': ensure => 'directory', owner => 'zulip', group => 'zulip', - mode => 640, + mode => '0640', } file { '/var/log/zulip/queue_error': ensure => 'directory', owner => 'zulip', group => 'zulip', - mode => 640, + mode => '0640', } file { "/usr/lib/nagios/plugins/zulip_base": @@ -116,7 +116,7 @@ class zulip::base { purge => true, owner => "root", group => "root", - mode => 755, + mode => '0755', source => "puppet:///modules/zulip/nagios_plugins/zulip_base", } } diff --git a/puppet/zulip/manifests/camo.pp b/puppet/zulip/manifests/camo.pp index c668f216cd..f6b8f9bae5 100644 --- a/puppet/zulip/manifests/camo.pp +++ b/puppet/zulip/manifests/camo.pp @@ -12,7 +12,7 @@ class zulip::camo { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', content => template("zulip/camo_defaults.template.erb"), } } diff --git a/puppet/zulip/manifests/localhost_camo.pp b/puppet/zulip/manifests/localhost_camo.pp index 33c824283b..3dfef18e45 100644 --- a/puppet/zulip/manifests/localhost_camo.pp +++ b/puppet/zulip/manifests/localhost_camo.pp @@ -7,7 +7,7 @@ class zulip::localhost_camo { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', notify => Service["nginx"], source => "puppet:///modules/zulip/nginx/zulip-include-app.d/camo.conf", } diff --git a/puppet/zulip/manifests/localhost_sso.pp b/puppet/zulip/manifests/localhost_sso.pp index 726c40c0f3..c877775ed0 100644 --- a/puppet/zulip/manifests/localhost_sso.pp +++ b/puppet/zulip/manifests/localhost_sso.pp @@ -4,7 +4,7 @@ class zulip::localhost_sso { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', notify => Service["nginx"], source => "puppet:///modules/zulip/nginx/zulip-include-app.d/external-sso.conf", } diff --git a/puppet/zulip/manifests/memcached.pp b/puppet/zulip/manifests/memcached.pp index 4639d7bed5..1d1b754984 100644 --- a/puppet/zulip/manifests/memcached.pp +++ b/puppet/zulip/manifests/memcached.pp @@ -9,7 +9,7 @@ class zulip::memcached { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', content => template("zulip/memcached.conf.template.erb"), } service { 'memcached': diff --git a/puppet/zulip/manifests/nagios.pp b/puppet/zulip/manifests/nagios.pp index f3adaa3939..ab95a497c2 100644 --- a/puppet/zulip/manifests/nagios.pp +++ b/puppet/zulip/manifests/nagios.pp @@ -9,7 +9,7 @@ class zulip::nagios { purge => true, owner => "root", group => "root", - mode => 755, + mode => '0755', source => "puppet:///modules/zulip/nagios_plugins/zulip_nagios_server", } } diff --git a/puppet/zulip/manifests/nginx.pp b/puppet/zulip/manifests/nginx.pp index cb957dc9bf..33224c2385 100644 --- a/puppet/zulip/manifests/nginx.pp +++ b/puppet/zulip/manifests/nginx.pp @@ -9,7 +9,7 @@ class zulip::nginx { recurse => true, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/nginx/zulip-include-common/", notify => Service["nginx"], } @@ -32,7 +32,7 @@ class zulip::nginx { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', notify => Service["nginx"], source => $uploads_route, } @@ -42,7 +42,7 @@ class zulip::nginx { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', notify => Service["nginx"], source => "puppet:///modules/zulip/nginx/nginx.conf", } @@ -52,7 +52,7 @@ class zulip::nginx { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', notify => Service["nginx"], source => "puppet:///modules/zulip/nginx/uwsgi_params", } @@ -66,14 +66,14 @@ class zulip::nginx { ensure => "directory", owner => "zulip", group => "adm", - mode => 650 + mode => '0650' } file { ["/var/lib/zulip", "/var/lib/zulip/certbot-webroot"]: ensure => "directory", owner => "zulip", group => "adm", - mode => 660, + mode => '0660', } service { 'nginx': diff --git a/puppet/zulip/manifests/postfix_localmail.pp b/puppet/zulip/manifests/postfix_localmail.pp index bb0acb841e..e665889506 100644 --- a/puppet/zulip/manifests/postfix_localmail.pp +++ b/puppet/zulip/manifests/postfix_localmail.pp @@ -15,7 +15,7 @@ class zulip::postfix_localmail { file {'/etc/mailname': ensure => file, - mode => 0644, + mode => '0644', owner => root, group => root, content => "${fqdn}", @@ -23,7 +23,7 @@ class zulip::postfix_localmail { file {'/etc/postfix/main.cf': ensure => file, - mode => 0644, + mode => '0644', owner => root, group => root, content => template('zulip/postfix/main.cf.erb'), @@ -32,7 +32,7 @@ class zulip::postfix_localmail { } file {'/etc/postfix/master.cf': ensure => file, - mode => 0644, + mode => '0644', owner => root, group => root, source => "puppet:///modules/zulip/postfix/master.cf", @@ -42,7 +42,7 @@ class zulip::postfix_localmail { file {'/etc/postfix/virtual': ensure => file, - mode => 0644, + mode => '0644', owner => root, group => root, source => "puppet:///modules/zulip/postfix/virtual", @@ -59,7 +59,7 @@ class zulip::postfix_localmail { file {'/etc/postfix/transport': ensure => file, - mode => 0644, + mode => '0644', owner => root, group => root, source => "puppet:///modules/zulip/postfix/transport", diff --git a/puppet/zulip/manifests/postgres_appdb_base.pp b/puppet/zulip/manifests/postgres_appdb_base.pp index 02daaa4b49..ec04e73de9 100644 --- a/puppet/zulip/manifests/postgres_appdb_base.pp +++ b/puppet/zulip/manifests/postgres_appdb_base.pp @@ -25,7 +25,7 @@ class zulip::postgres_appdb_base { ensure => file, owner => "root", group => "root", - mode => 755, + mode => '0755', source => "puppet:///modules/zulip/postgresql/process_fts_updates", } @@ -34,7 +34,7 @@ class zulip::postgres_appdb_base { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/supervisor/conf.d/zulip_db.conf", notify => Service[supervisor], } @@ -54,7 +54,7 @@ class zulip::postgres_appdb_base { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/postgresql/zulip_english.stop", } file { "/usr/lib/nagios/plugins/zulip_postgres_appdb": @@ -63,7 +63,7 @@ class zulip::postgres_appdb_base { purge => true, owner => "root", group => "root", - mode => 755, + mode => '0755', source => "puppet:///modules/zulip/nagios_plugins/zulip_postgres_appdb", } @@ -85,7 +85,7 @@ class zulip::postgres_appdb_base { ensure => file, owner => "postgres", group => "postgres", - mode => 640, + mode => '0640', source => "puppet:///modules/zulip/postgresql/pgroonga_setup.sql", } diff --git a/puppet/zulip/manifests/postgres_appdb_tuned.pp b/puppet/zulip/manifests/postgres_appdb_tuned.pp index 3124abbdff..4edafaa6ee 100644 --- a/puppet/zulip/manifests/postgres_appdb_tuned.pp +++ b/puppet/zulip/manifests/postgres_appdb_tuned.pp @@ -13,7 +13,7 @@ if $zulip::base::release_name == "trusty" { ensure => file, owner => "postgres", group => "postgres", - mode => 644, + mode => '0644', content => template("zulip/postgresql/${zulip::base::postgres_version}/postgresql.conf.template.erb"), } @@ -26,7 +26,7 @@ if $zulip::base::release_name == "trusty" { ensure => file, owner => 'root', group => 'root', - mode => 644, + mode => '0644', content => "kernel.shmall = $half_memory_pages kernel.shmmax = $half_memory @@ -82,7 +82,7 @@ vm.dirty_background_ratio = 5 ensure => file, owner => "postgres", group => "postgres", - mode => 644, + mode => '0644', content => template("zulip/postgresql/${zulip::base::postgres_version}/postgresql.conf.template.erb"), } diff --git a/puppet/zulip/manifests/postgres_common.pp b/puppet/zulip/manifests/postgres_common.pp index 5d50f9c8e9..387f8556de 100644 --- a/puppet/zulip/manifests/postgres_common.pp +++ b/puppet/zulip/manifests/postgres_common.pp @@ -32,7 +32,7 @@ class zulip::postgres_common { purge => true, owner => "root", group => "root", - mode => 755, + mode => '0755', source => "puppet:///modules/zulip/nagios_plugins/zulip_postgres_common", } @@ -40,7 +40,7 @@ class zulip::postgres_common { ensure => file, owner => "root", group => "postgres", - mode => 750, + mode => '0750', source => "puppet:///modules/zulip/postgresql/env-wal-e", require => Package["postgresql-${zulip::base::postgres_version}"], } @@ -49,7 +49,7 @@ class zulip::postgres_common { ensure => file, owner => "root", group => "postgres", - mode => 754, + mode => '0754', source => "puppet:///modules/zulip/postgresql/pg_backup_and_purge", require => File["/usr/local/bin/env-wal-e"], } diff --git a/puppet/zulip/manifests/rabbit.pp b/puppet/zulip/manifests/rabbit.pp index f470123aa7..9eb9da362b 100644 --- a/puppet/zulip/manifests/rabbit.pp +++ b/puppet/zulip/manifests/rabbit.pp @@ -10,7 +10,7 @@ class zulip::rabbit { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/cron.d/rabbitmq-queuesize", } file { "/etc/cron.d/rabbitmq-numconsumers": @@ -18,7 +18,7 @@ class zulip::rabbit { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/cron.d/rabbitmq-numconsumers", } @@ -27,7 +27,7 @@ class zulip::rabbit { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/rabbitmq/rabbitmq-server", } @@ -36,7 +36,7 @@ class zulip::rabbit { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/rabbitmq/rabbitmq.config", } @@ -46,7 +46,7 @@ class zulip::rabbit { ensure => 'directory', owner => "root", group => "root", - mode => 755, + mode => '0755', } file { "/etc/rabbitmq/rabbitmq-env.conf": @@ -55,7 +55,7 @@ class zulip::rabbit { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', content => template("zulip/rabbitmq-env.conf.template.erb"), } } diff --git a/puppet/zulip/manifests/redis.pp b/puppet/zulip/manifests/redis.pp index 802a0a9638..67fa49ed0b 100644 --- a/puppet/zulip/manifests/redis.pp +++ b/puppet/zulip/manifests/redis.pp @@ -27,7 +27,7 @@ class zulip::redis { ensure => file, owner => "redis", group => "redis", - mode => 640, + mode => '0640', content => template("zulip/zulip-redis.template.erb"), } diff --git a/puppet/zulip/manifests/supervisor.pp b/puppet/zulip/manifests/supervisor.pp index bd8b13743c..7bf4d432c4 100644 --- a/puppet/zulip/manifests/supervisor.pp +++ b/puppet/zulip/manifests/supervisor.pp @@ -51,7 +51,7 @@ class zulip::supervisor { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/supervisor/supervisord.conf", notify => Service["supervisor"], } diff --git a/puppet/zulip/manifests/zulip_org.pp b/puppet/zulip/manifests/zulip_org.pp index 8839d01c3e..2aab9e69ff 100644 --- a/puppet/zulip/manifests/zulip_org.pp +++ b/puppet/zulip/manifests/zulip_org.pp @@ -7,7 +7,7 @@ class zulip::zulip_org { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/nginx/sites-available/zulip-org", notify => Service["nginx"], } diff --git a/puppet/zulip_ops/manifests/apache.pp b/puppet/zulip_ops/manifests/apache.pp index 74f7c0455f..a5156a1f86 100644 --- a/puppet/zulip_ops/manifests/apache.pp +++ b/puppet/zulip_ops/manifests/apache.pp @@ -15,7 +15,7 @@ class zulip_ops::apache { ensure => directory, owner => "www-data", group => "www-data", - mode => 600, + mode => '0600', } file { "/etc/apache2/users/wiki": @@ -23,7 +23,7 @@ class zulip_ops::apache { ensure => file, owner => "www-data", group => "www-data", - mode => 600, + mode => '0600', source => "puppet:///modules/zulip_ops/apache/users", } @@ -32,7 +32,7 @@ class zulip_ops::apache { ensure => directory, owner => "root", group => "root", - mode => 644, + mode => '0644', } file { "/etc/apache2/ports.conf": @@ -40,7 +40,7 @@ class zulip_ops::apache { ensure => file, owner => "root", group => "root", - mode => 640, + mode => '0640', source => "puppet:///modules/zulip_ops/apache/ports.conf", } @@ -49,6 +49,6 @@ class zulip_ops::apache { require => Package[apache2], owner => "root", group => "root", - mode => 640, + mode => '0640', } } diff --git a/puppet/zulip_ops/manifests/app_frontend.pp b/puppet/zulip_ops/manifests/app_frontend.pp index 876ebe1a3e..d4d1b3ca4d 100644 --- a/puppet/zulip_ops/manifests/app_frontend.pp +++ b/puppet/zulip_ops/manifests/app_frontend.pp @@ -14,7 +14,7 @@ class zulip_ops::app_frontend { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip/logrotate/zulip", } @@ -22,7 +22,7 @@ class zulip_ops::app_frontend { ensure => file, owner => "zulip", group => "zulip", - mode => 644, + mode => '0644', source => 'puppet:///modules/zulip_ops/log2zulip.conf', } @@ -30,7 +30,7 @@ class zulip_ops::app_frontend { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => 'puppet:///modules/zulip_ops/cron.d/log2zulip', } @@ -38,7 +38,7 @@ class zulip_ops::app_frontend { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => 'puppet:///modules/zulip_ops/cron.d/check_send_receive_time', } @@ -46,7 +46,7 @@ class zulip_ops::app_frontend { ensure => file, owner => "zulip", group => "zulip", - mode => 600, + mode => '0600', source => 'puppet:///modules/zulip_ops/log2zulip.zuliprc', } file { "/etc/cron.d/check-apns-tokens": @@ -58,14 +58,14 @@ class zulip_ops::app_frontend { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', content => template("zulip_ops/supervisor/conf.d/redis_tunnel.conf.template.erb"), notify => Service["supervisor"], } # Need redis_password in its own file for Nagios file { '/var/lib/nagios/redis_password': ensure => file, - mode => 600, + mode => '0600', owner => "nagios", group => "nagios", content => zulipsecret('secrets', 'redis_password', ''), diff --git a/puppet/zulip_ops/manifests/base.pp b/puppet/zulip_ops/manifests/base.pp index d4a3af2b50..161e4dca33 100644 --- a/puppet/zulip_ops/manifests/base.pp +++ b/puppet/zulip_ops/manifests/base.pp @@ -47,13 +47,13 @@ class zulip_ops::base { file { '/etc/apt/apt.conf.d/02periodic': ensure => file, - mode => 644, + mode => '0644', source => 'puppet:///modules/zulip_ops/apt/apt.conf.d/02periodic', } file { '/etc/apt/apt.conf.d/50unattended-upgrades': ensure => file, - mode => 644, + mode => '0644', source => 'puppet:///modules/zulip_ops/apt/apt.conf.d/50unattended-upgrades', } @@ -62,7 +62,7 @@ class zulip_ops::base { require => User['zulip'], owner => "zulip", group => "zulip", - mode => 600, + mode => '0600', } file { '/etc/pam.d/common-session': @@ -71,7 +71,7 @@ class zulip_ops::base { source => 'puppet:///modules/zulip_ops/common-session', owner => 'root', group => 'root', - mode => 644, + mode => '0644', } service { 'ssh': @@ -86,14 +86,14 @@ class zulip_ops::base { source => 'puppet:///modules/zulip_ops/sshd_config', owner => 'root', group => 'root', - mode => 644, + mode => '0644', notify => Service['ssh'], } } file { '/root/.emacs': ensure => file, - mode => 600, + mode => '0600', owner => "root", group => "root", source => 'puppet:///modules/zulip_ops/dot_emacs.el', @@ -101,7 +101,7 @@ class zulip_ops::base { file { '/home/zulip/.emacs': ensure => file, - mode => 600, + mode => '0600', owner => "zulip", group => "zulip", source => 'puppet:///modules/zulip_ops/dot_emacs.el', @@ -112,7 +112,7 @@ class zulip_ops::base { # TODO: Change this condition to something more coherent. file { '/root/.ssh/authorized_keys': ensure => file, - mode => 600, + mode => '0600', owner => "root", group => "root", source => 'puppet:///modules/zulip_ops/root_authorized_keys', @@ -120,7 +120,7 @@ class zulip_ops::base { file { '/home/zulip/.ssh/authorized_keys': ensure => file, require => File['/home/zulip/.ssh'], - mode => 600, + mode => '0600', owner => "zulip", group => "zulip", source => 'puppet:///modules/zulip_ops/authorized_keys', @@ -128,7 +128,7 @@ class zulip_ops::base { file { '/var/lib/nagios/.ssh/authorized_keys': ensure => file, require => File['/var/lib/nagios/.ssh'], - mode => 600, + mode => '0600', owner => "nagios", group => "nagios", source => 'puppet:///modules/zulip_ops/nagios_authorized_keys', @@ -140,13 +140,13 @@ class zulip_ops::base { # ones in EC2. file { '/usr/local/sbin/zulip-ec2-configure-interfaces': ensure => file, - mode => 755, + mode => '0755', source => 'puppet:///modules/zulip_ops/zulip-ec2-configure-interfaces', } file { '/etc/network/if-up.d/zulip-ec2-configure-interfaces_if-up.d.sh': ensure => file, - mode => 755, + mode => '0755', source => 'puppet:///modules/zulip_ops/zulip-ec2-configure-interfaces_if-up.d.sh', } } @@ -168,14 +168,14 @@ class zulip_ops::base { require => User['nagios'], owner => "nagios", group => "nagios", - mode => 600, + mode => '0600', } file { '/var/lib/nagios/.ssh': ensure => directory, require => File['/var/lib/nagios/'], owner => "nagios", group => "nagios", - mode => 600, + mode => '0600', } file { '/home/nagios': ensure => absent, @@ -186,7 +186,7 @@ class zulip_ops::base { # Trusty's puppet doesn't support the include? rule used in rules.v4. file { '/etc/iptables/rules.v4': ensure => file, - mode => 600, + mode => '0600', content => template('zulip_ops/iptables/rules.v4.erb'), require => Package['iptables-persistent'], } diff --git a/puppet/zulip_ops/manifests/git.pp b/puppet/zulip_ops/manifests/git.pp index c7e135fb16..136fc3dfe3 100644 --- a/puppet/zulip_ops/manifests/git.pp +++ b/puppet/zulip_ops/manifests/git.pp @@ -8,7 +8,7 @@ class zulip_ops::git { ensure => 'directory', owner => 'git', group => 'git', - mode => 755, + mode => '0755', } file { '/home/git/repositories/eng/zulip.git/hooks/post-receive': diff --git a/puppet/zulip_ops/manifests/loadbalancer.pp b/puppet/zulip_ops/manifests/loadbalancer.pp index d969b2c0d0..a56bc0a56a 100644 --- a/puppet/zulip_ops/manifests/loadbalancer.pp +++ b/puppet/zulip_ops/manifests/loadbalancer.pp @@ -8,7 +8,7 @@ class zulip_ops::loadbalancer { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip_ops/nginx/sites-available/loadbalancer", notify => Service["nginx"], } @@ -17,7 +17,7 @@ class zulip_ops::loadbalancer { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip_ops/motd.lb0", } @@ -32,7 +32,7 @@ class zulip_ops::loadbalancer { ensure => file, owner => "zulip", group => "zulip", - mode => 644, + mode => '0644', source => 'puppet:///modules/zulip_ops/log2zulip.conf', } @@ -40,7 +40,7 @@ class zulip_ops::loadbalancer { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => 'puppet:///modules/zulip_ops/cron.d/log2zulip', } @@ -48,7 +48,7 @@ class zulip_ops::loadbalancer { ensure => file, owner => "zulip", group => "zulip", - mode => 600, + mode => '0600', source => 'puppet:///modules/zulip_ops/log2zulip.zuliprc', } } diff --git a/puppet/zulip_ops/manifests/munin.pp b/puppet/zulip_ops/manifests/munin.pp index 1d7aebe94d..915bb66b17 100644 --- a/puppet/zulip_ops/manifests/munin.pp +++ b/puppet/zulip_ops/manifests/munin.pp @@ -17,7 +17,7 @@ class zulip_ops::munin { recurse => true, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip_ops/munin" } @@ -26,14 +26,14 @@ class zulip_ops::munin { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', content => template("zulip_ops/munin/munin.conf.erb") } file { "/etc/supervisor/conf.d/munin_tunnels.conf": require => Package["supervisor", "autossh"], ensure => file, - mode => 644, + mode => '0644', owner => "root", group => "root", content => template("zulip_ops/supervisor/conf.d/munin_tunnels.conf.erb"), diff --git a/puppet/zulip_ops/manifests/nagios.pp b/puppet/zulip_ops/manifests/nagios.pp index 42404dfeb9..fb9ac3b851 100644 --- a/puppet/zulip_ops/manifests/nagios.pp +++ b/puppet/zulip_ops/manifests/nagios.pp @@ -44,7 +44,7 @@ class zulip_ops::nagios { require => Package[nagios3], owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip_ops/nagios3/", notify => Service["nagios3"], } @@ -53,7 +53,7 @@ class zulip_ops::nagios { require => Package[nagios3], owner => "root", group => "root", - mode => 644, + mode => '0644', content => template("zulip_ops/nagios3/contacts.cfg.template.erb"), notify => Service["nagios3"], } @@ -61,7 +61,7 @@ class zulip_ops::nagios { require => Package[nagios3], owner => "root", group => "root", - mode => 644, + mode => '0644', content => template("zulip_ops/nagios3/hosts.cfg.template.erb"), notify => Service["nagios3"], } @@ -69,7 +69,7 @@ class zulip_ops::nagios { require => Package[nagios3], owner => "root", group => "root", - mode => 644, + mode => '0644', content => template("zulip_ops/nagios3/localhost.cfg.template.erb"), notify => Service["nagios3"], } @@ -78,7 +78,7 @@ class zulip_ops::nagios { require => Package[nagios3], owner => "root", group => "root", - mode => 644, + mode => '0644', content => template("zulip_ops/nagios3/cgi.cfg.template.erb"), notify => Service["nagios3"], } @@ -98,7 +98,7 @@ class zulip_ops::nagios { file { '/etc/nagios3/conf.d/zulip_nagios.cfg': ensure => file, - mode => 644, + mode => '0644', owner => "root", group => "root", source => '/usr/local/share/zulip/integrations/nagios/zulip_nagios.cfg', @@ -108,7 +108,7 @@ class zulip_ops::nagios { $hosts = $zulip_ops::base::hosts file { '/etc/nagios3/conf.d/zulip_autossh.cfg': ensure => file, - mode => 644, + mode => '0644', owner => "root", group => "root", content => template('zulip_ops/nagios_autossh.template.erb'), @@ -117,7 +117,7 @@ class zulip_ops::nagios { file { '/var/lib/nagios/msmtprc': ensure => file, - mode => 600, + mode => '0600', owner => "nagios", group => "nagios", content => template("zulip_ops/msmtprc_nagios.template.erb"), @@ -141,7 +141,7 @@ class zulip_ops::nagios { require => Package[apache2], owner => "root", group => "root", - mode => 640, + mode => '0640', content => template("zulip_ops/nagios_apache_site.conf.template.erb"), } # TODO: Install our API diff --git a/puppet/zulip_ops/manifests/postgres_appdb.pp b/puppet/zulip_ops/manifests/postgres_appdb.pp index 66467a4510..ea4c9a07f1 100644 --- a/puppet/zulip_ops/manifests/postgres_appdb.pp +++ b/puppet/zulip_ops/manifests/postgres_appdb.pp @@ -7,7 +7,7 @@ class zulip_ops::postgres_appdb { ensure => file, owner => "postgres", group => "postgres", - mode => 640, + mode => '0640', source => "puppet:///modules/zulip_ops/postgresql/pg_hba.conf", } @@ -16,7 +16,7 @@ class zulip_ops::postgres_appdb { ensure => file, owner => "postgres", group => "postgres", - mode => 640, + mode => '0640', source => "puppet:///modules/zulip_ops/postgresql/zulip_nagios_setup.sql", } diff --git a/puppet/zulip_ops/manifests/postgres_master.pp b/puppet/zulip_ops/manifests/postgres_master.pp index a30c0bd02c..b3fb03e3ad 100644 --- a/puppet/zulip_ops/manifests/postgres_master.pp +++ b/puppet/zulip_ops/manifests/postgres_master.pp @@ -12,7 +12,7 @@ class zulip_ops::postgres_master { ensure => file, owner => 'root', group => 'root', - mode => 644, + mode => '0644', source => 'puppet:///modules/zulip_ops/postgresql/40-postgresql.conf.master', } @@ -20,7 +20,7 @@ class zulip_ops::postgres_master { ensure => file, owner => 'root', group => 'root', - mode => 744, + mode => '0744', source => 'puppet:///modules/zulip_ops/postgresql/setup_disks.sh', } diff --git a/puppet/zulip_ops/manifests/postgres_slave.pp b/puppet/zulip_ops/manifests/postgres_slave.pp index 5dfbce5291..35c1f2865b 100644 --- a/puppet/zulip_ops/manifests/postgres_slave.pp +++ b/puppet/zulip_ops/manifests/postgres_slave.pp @@ -7,14 +7,14 @@ class zulip_ops::postgres_slave { ensure => file, owner => "postgres", group => "postgres", - mode => 644, + mode => '0644', source => 'puppet:///modules/zulip_ops/postgresql/recovery.conf', } file { '/etc/sysctl.d/40-postgresql.conf': ensure => file, owner => 'root', group => 'root', - mode => 644, + mode => '0644', source => 'puppet:///modules/zulip_ops/postgresql/40-postgresql.conf.slave', } } diff --git a/puppet/zulip_ops/manifests/prod_app_frontend.pp b/puppet/zulip_ops/manifests/prod_app_frontend.pp index e2f599cebb..9b775782b7 100644 --- a/puppet/zulip_ops/manifests/prod_app_frontend.pp +++ b/puppet/zulip_ops/manifests/prod_app_frontend.pp @@ -8,7 +8,7 @@ class zulip_ops::prod_app_frontend { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip_ops/nginx/sites-available/zulip", notify => Service["nginx"], } @@ -26,7 +26,7 @@ class zulip_ops::prod_app_frontend { purge => true, owner => "root", group => "root", - mode => 755, + mode => '0755', source => "puppet:///modules/zulip_ops/nagios_plugins/zulip_zephyr_mirror", } diff --git a/puppet/zulip_ops/manifests/redis.pp b/puppet/zulip_ops/manifests/redis.pp index b8ba5e893c..01d37ea411 100644 --- a/puppet/zulip_ops/manifests/redis.pp +++ b/puppet/zulip_ops/manifests/redis.pp @@ -5,7 +5,7 @@ class zulip_ops::redis { # Need redis_password in its own file for Nagios file { '/var/lib/nagios/redis_password': ensure => file, - mode => 600, + mode => '0600', owner => "nagios", group => "nagios", content => "${zulip::redis::redis_password}\n", diff --git a/puppet/zulip_ops/manifests/staging_app_frontend.pp b/puppet/zulip_ops/manifests/staging_app_frontend.pp index 69ce643b06..f217c1cb21 100644 --- a/puppet/zulip_ops/manifests/staging_app_frontend.pp +++ b/puppet/zulip_ops/manifests/staging_app_frontend.pp @@ -7,7 +7,7 @@ class zulip_ops::staging_app_frontend { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip_ops/nginx/sites-available/zulip-staging", notify => Service["nginx"], } diff --git a/puppet/zulip_ops/manifests/zmirror.pp b/puppet/zulip_ops/manifests/zmirror.pp index 5880023f8b..9b3ca9e588 100644 --- a/puppet/zulip_ops/manifests/zmirror.pp +++ b/puppet/zulip_ops/manifests/zmirror.pp @@ -33,7 +33,7 @@ class zulip_ops::zmirror { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip_ops/supervisor/conf.d/zmirror.conf", notify => Service["supervisor"], } @@ -42,7 +42,7 @@ class zulip_ops::zmirror { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip_ops/cron.d/zephyr-mirror", } @@ -50,7 +50,7 @@ class zulip_ops::zmirror { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip_ops/zephyr-clients.debathena", } @@ -60,7 +60,7 @@ class zulip_ops::zmirror { purge => true, owner => "root", group => "root", - mode => 755, + mode => '0755', source => "puppet:///modules/zulip_ops/nagios_plugins/zulip_zephyr_mirror", } diff --git a/puppet/zulip_ops/manifests/zmirror_personals.pp b/puppet/zulip_ops/manifests/zmirror_personals.pp index 0db41b3b9b..f2af58db0f 100644 --- a/puppet/zulip_ops/manifests/zmirror_personals.pp +++ b/puppet/zulip_ops/manifests/zmirror_personals.pp @@ -30,7 +30,7 @@ class zulip_ops::zmirror_personals { file { ['/home/zulip/api-keys', '/home/zulip/zephyr_sessions', '/home/zulip/ccache', '/home/zulip/mirror_status']: ensure => directory, - mode => 644, + mode => '0644', owner => "zulip", group => "zulip", } @@ -39,7 +39,7 @@ class zulip_ops::zmirror_personals { ensure => file, owner => "root", group => "root", - mode => 644, + mode => '0644', source => "puppet:///modules/zulip_ops/cron.d/test_zephyr_personal_mirrors", } @@ -49,7 +49,7 @@ class zulip_ops::zmirror_personals { purge => true, owner => "root", group => "root", - mode => 755, + mode => '0755', source => "puppet:///modules/zulip_ops/nagios_plugins/zulip_zephyr_mirror", }