Removed new lines from manifests

Removed now unneeded mkdir

Dockerfile

@@ -31,7 +31,6 @@ RUN chmod 755 /entrypoint.sh && \
     cp -a /root/zulip/zproject/local_settings_template.py /etc/zulip/settings.py && \
     ln -nsf /etc/zulip/settings.py /root/zulip/zproject/local_settings.py && \
     ZULIP_DEPLOY_PATH=$(/root/zulip/zulip_tools.py make_deploy_path) && \
-    mkdir -p "$ZULIP_DEPLOY_PATH" && \
     mv /root/zulip "$ZULIP_DEPLOY_PATH" && \
     ln -nsf /home/zulip/deployments/next /root/zulip && \
     ln -nsf "$ZULIP_DEPLOY_PATH" /home/zulip/deployments/next && \

includes/zulip/manifests/app_frontend.pp

@@ -127,35 +127,27 @@ class zulip::app_frontend {
     owner      => "zulip",
     group      => "zulip",
     mode       => 644,
-    source     => 'puppet:///modules/zulip_internal/log2zulip.conf',
+    source     => 'puppet:///modules/zulip/log2zulip.conf',
   }
-  file { '/etc/cron.d/log2zulip':
+  file { '/etc/zulip':
     ensure     => file,
     owner      => "root",
     group      => "root",
     mode       => 644,
-    source     => 'puppet:///modules/zulip_internal/cron.d/log2zulip',
+    source     => 'puppet:///modules/zulip/zulip',
   }
   file { '/etc/log2zulip.zuliprc':
     ensure     => file,
     owner      => "zulip",
     group      => "zulip",
     mode       => 600,
-    source     => 'puppet:///modules/zulip_internal/log2zulip.zuliprc',
+    source     => 'puppet:///modules/zulip/log2zulip.zuliprc',
   }
   file { "/etc/cron.d/check-apns-tokens":
     ensure => file,
     owner  => "root",
     group  => "root",
     mode => 644,
-    source => "puppet:///modules/zulip_internal/cron.d/check-apns-tokens",
+    source => "puppet:///modules/zulip/cron.d/check-apns-tokens",
-  }
-  file { "/etc/supervisor/conf.d/cron.conf":
-    require => Package[supervisor],
-    ensure => file,
-    owner => "root",
-    group => "root",
-    mode => 644,
-    source => "puppet:///modules/zulip/supervisor/conf.d/cron.conf",
   }
 }

includes/zulip/manifests/base.pp

@@ -9,11 +9,9 @@ class zulip::base {
                      "python-simplejson",
                      ]
   package { $base_packages: ensure => "installed" }
-
   group { 'zulip':
     ensure     => present,
   }
-
   user { 'zulip':
     ensure     => present,
     require    => Group['zulip'],
@@ -22,14 +20,12 @@ class zulip::base {
     home       => '/home/zulip',
     managehome => true,
   }
-
   file { '/etc/zulip':
     ensure     => 'directory',
     mode       => 644,
     owner      => 'zulip',
     group      => 'zulip',
   }
-
   file { '/etc/security/limits.conf':
     ensure     => file,
     mode       => 640,
@@ -37,14 +33,12 @@ class zulip::base {
     group      => "root",
     source     => 'puppet:///modules/zulip/limits.conf',
   }
-
   file { '/var/log/zulip':
     ensure => 'directory',
     owner  => 'zulip',
     group  => 'zulip',
     mode   => 640,
   }
-
   file { '/var/log/zulip/queue_error':
     ensure => 'directory',
     owner  => 'zulip',

includes/zulip/manifests/camo.pp

@@ -4,6 +4,5 @@ class zulip::camo {
                     "camo",
                     ]
   package { $camo_packages: ensure => "installed" }
-
   # The configuration file is generated at install time
 }

includes/zulip/manifests/nginx.pp

@@ -4,7 +4,6 @@ class zulip::nginx {
                    "nginx-full",
                    ]
   package { $web_packages: ensure => "installed" }
-
   file { "/etc/nginx/zulip-include/":
     require => Package["nginx-full"],
     recurse => true,
@@ -13,7 +12,6 @@ class zulip::nginx {
     mode => 644,
     source => "puppet:///modules/zulip/nginx/zulip-include-common/",
   }
-
   file { "/etc/nginx/nginx.conf":
     require => Package["nginx-full"],
     ensure => file,
@@ -22,7 +20,6 @@ class zulip::nginx {
     mode => 644,
     source => "puppet:///modules/zulip/nginx/nginx.conf",
   }
-
   file { "/etc/nginx/fastcgi_params":
     require => Package["nginx-full"],
     ensure => file,
@@ -31,17 +28,7 @@ class zulip::nginx {
     mode => 644,
     source => "puppet:///modules/zulip/nginx/fastcgi_params",
   }
-
   file { "/etc/nginx/sites-enabled/default":
     ensure => absent,
   }
-
-  file { "/etc/supervisor/conf.d/camo.conf":
-    require => Package[camo],
-    ensure => file,
-    owner => "root",
-    group => "root",
-    mode => 644,
-    source => "puppet:///modules/zulip/supervisor/conf.d/camo.conf",
-  }
 }

includes/zulip/manifests/postgres_appdb.pp

@@ -1,7 +1,6 @@
 class zulip::postgres_appdb {
   include zulip::postgres_common
   include zulip::supervisor
-
   $appdb_packages = [# Needed to run process_fts_updates
                      "python-psycopg2",
                      # Needed for our full text search system
@@ -13,7 +12,6 @@ class zulip::postgres_appdb {
     }
   }
   safepackage { $appdb_packages: ensure => "installed" }
-
   file { "/usr/local/bin/process_fts_updates":
     ensure => file,
     owner => "root",
@@ -21,7 +19,6 @@ class zulip::postgres_appdb {
     mode => 755,
     source => "puppet:///modules/zulip/postgresql/process_fts_updates",
   }
-
   file { "/etc/supervisor/conf.d/zulip_db.conf":
     require => Package[supervisor],
     ensure => file,

includes/zulip/manifests/rabbit.pp

@@ -4,7 +4,6 @@ class zulip::rabbit {
                       "rabbitmq-server",
                       ]
   package { $rabbit_packages: ensure => "installed" }
-
   file { "/etc/cron.d/rabbitmq-queuesize":
     require => Package[rabbitmq-server],
     ensure => file,
@@ -21,7 +20,6 @@ class zulip::rabbit {
     mode => 644,
     source => "puppet:///modules/zulip/cron.d/rabbitmq-numconsumers",
   }
-
   file { "/etc/default/rabbitmq-server":
     require => Package[rabbitmq-server],
     ensure => file,

includes/zulip/manifests/supervisor.pp

@@ -11,4 +11,20 @@ class zulip::supervisor {
     mode => 644,
     source => "puppet:///modules/zulip/supervisor/supervisord.conf",
   }
+  file { "/etc/supervisor/conf.d/cron.conf":
+    require => Package[supervisor],
+    ensure => file,
+    owner => "root",
+    group => "root",
+    mode => 644,
+    source => "puppet:///modules/zulip/supervisor/conf.d/cron.conf",
+  }
+  file { "/etc/supervisor/conf.d/camo.conf":
+    require => Package[camo],
+    ensure => file,
+    owner => "root",
+    group => "root",
+    mode => 644,
+    source => "puppet:///modules/zulip/supervisor/conf.d/camo.conf",
+  }
 }

includes/zulip/manifests/voyager.pp

@@ -2,7 +2,6 @@ class zulip::voyager {
   include zulip::base
   include zulip::app_frontend
   include zulip::postgres_appdb
-
   apt::source {'zulip':
     location    => 'http://ppa.launchpad.net/tabbott/zulip/ubuntu',
     release     => 'trusty',
@@ -12,7 +11,6 @@ class zulip::voyager {
     pin         => '995',
     include_src => true,
   }
-
   file { "/etc/nginx/sites-available/zulip-enterprise":
     require => Package["nginx-full"],
     ensure => file,
@@ -26,13 +24,11 @@ class zulip::voyager {
     ensure => 'link',
     target => '/etc/nginx/sites-available/zulip-enterprise',
   }
-
   file { '/home/zulip/prod-static':
     ensure => 'directory',
     owner  => 'zulip',
     group  => 'zulip',
   }
-
   file { "/etc/cron.d/restart-zulip":
     ensure => file,
     owner  => "root",