From 3855b1f2f106e353f27cc5746cef8a863554d859 Mon Sep 17 00:00:00 2001
From: gau1991 <gaurav.astikar@rtcamp.com>
Date: Thu, 12 Feb 2015 15:33:26 +0530
Subject: [PATCH] Fixed Nginx config issue

---
 ee/cli/plugins/secure.py |  4 ++--
 ee/cli/plugins/stack.py  | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ee/cli/plugins/secure.py b/ee/cli/plugins/secure.py
index 359d8513..a9a78bc6 100644
--- a/ee/cli/plugins/secure.py
+++ b/ee/cli/plugins/secure.py
@@ -92,12 +92,12 @@ class EESecureController(CementBaseController):
         if EEVariables.ee_platform_distro == 'Ubuntu':
             EEShellExec.cmd_exec(self, "sed -i \"s/listen.*/listen "
                                  "{port} default_server ssl spdy;/\" "
-                                 "/etc/nginx/sites-available/22222.conf"
+                                 "/etc/nginx/sites-available/22222"
                                  .format(port=self.app.pargs.user_input))
         if EEVariables.ee_platform_distro == 'debian':
             EEShellExec.cmd_exec(self, "sed -i \"s/listen.*/listen "
                                  "{port} default_server ssl;/\" "
-                                 "/etc/nginx/sites-available/22222.conf"
+                                 "/etc/nginx/sites-available/22222"
                                  .format(port=self.app.pargs.user_input))
         Log.info(self, "Successfully port changed {port}"
                  .format(port=self.app.pargs.user_input))
diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py
index 1ace9eb3..fdfecb6b 100644
--- a/ee/cli/plugins/stack.py
+++ b/ee/cli/plugins/stack.py
@@ -278,8 +278,8 @@ class EEStackController(CementBaseController):
                     # 22222 port settings
                     Log.debug(self, 'Writting the nginx configuration to '
                               'file /etc/nginx/sites-available/'
-                              '22222.conf')
-                    ee_nginx = open('/etc/nginx/sites-available/22222.conf',
+                              '22222')
+                    ee_nginx = open('/etc/nginx/sites-available/22222',
                                     encoding='utf-8', mode='w')
                     self.app.render((data), '22222.mustache',
                                     out=ee_nginx)
@@ -297,10 +297,10 @@ class EEStackController(CementBaseController):
                     # Create Symbolic link for 22222
                     EEFileUtils.create_symlink(self, ['/etc/nginx/'
                                                       'sites-available/'
-                                                      '22222.conf',
+                                                      '22222',
                                                       '/etc/nginx/'
                                                       'sites-enabled/'
-                                                      '22222.conf'])
+                                                      '22222'])
                     # Create log and cert folder and softlinks
                     if not os.path.exists('{0}22222/logs'
                                           .format(EEVariables.ee_webroot)):
@@ -1052,17 +1052,17 @@ class EEStackController(CementBaseController):
 
                 Log.debug(self, 'Writting the nginx configuration for '
                           'RoundCubemail')
-                ee_rc = open('/etc/nginx/sites-available/webmail.conf',
+                ee_rc = open('/etc/nginx/sites-available/webmail',
                              encoding='utf-8', mode='w')
                 self.app.render((data), 'virtualconf.mustache',
                                 out=ee_rc)
                 ee_rc.close()
 
-                # Create Symbolic link for webmail.conf
+                # Create Symbolic link for webmail
                 EEFileUtils.create_symlink(self, ['/etc/nginx/sites-available'
-                                                  '/webmail.conf',
+                                                  '/webmail',
                                                   '/etc/nginx/sites-enabled/'
-                                                  'webmail.conf'])
+                                                  'webmail'])
                 # Create log folder and softlinks
                 if not os.path.exists('{0}roundcubemail/logs'
                                       .format(EEVariables.ee_webroot)):