From 5bbd732abdfd056fde02942d1545fbe9933417ba Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Mon, 22 Feb 2016 11:51:39 +0530 Subject: [PATCH] spliting virtualconf --- ee/cli/plugins/site.py | 2 +- ee/cli/plugins/site_functions.py | 9 ++-- ee/cli/templates/virtualconf-php7.mustache | 49 ++++++++++++++++++++++ ee/cli/templates/virtualconf.mustache | 6 +-- 4 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 ee/cli/templates/virtualconf-php7.mustache diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py index 46125e22..e419386f 100644 --- a/ee/cli/plugins/site.py +++ b/ee/cli/plugins/site.py @@ -516,8 +516,8 @@ class EESiteCreateController(CementBaseController): and (not self.app.pargs.hhvm): data['basic'] = True + print("in site.py") for key, value in data.items() : - print("in site.py") print (key, value) diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 05ac8c0a..c3e78e7b 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -71,9 +71,12 @@ def setupdomain(self, data): ee_site_nginx_conf = open('/etc/nginx/sites-available/{0}' .format(ee_domain_name), encoding='utf-8', mode='w') - - self.app.render((data), 'virtualconf.mustache', - out=ee_site_nginx_conf) + if not data['php7']: + self.app.render((data), 'virtualconf.mustache', + out=ee_site_nginx_conf) + else: + self.app.render((data), 'virtualconf-php7.mustache', + out=ee_site_nginx_conf) ee_site_nginx_conf.close() except IOError as e: Log.debug(self, "{0}".format(e)) diff --git a/ee/cli/templates/virtualconf-php7.mustache b/ee/cli/templates/virtualconf-php7.mustache new file mode 100644 index 00000000..c5012f9c --- /dev/null +++ b/ee/cli/templates/virtualconf-php7.mustache @@ -0,0 +1,49 @@ + +server { + + {{#multisite}} + # Uncomment the following line for domain mapping + # listen 80 default_server; + {{/multisite}} + + server_name {{^vma}}{{^rc}}{{site_name}}{{/rc}}{{/vma}} {{#vma}}vma.*{{/vma}} {{#rc}}webmail.*{{/rc}} {{^vma}}{{^rc}}{{#multisite}}*{{/multisite}}{{^multisite}}www{{/multisite}}.{{site_name}}{{/rc}}{{/vma}}; + + {{#multisite}} + # Uncomment the following line for domain mapping + #server_name_in_redirect off; + {{/multisite}} + + access_log /var/log/nginx/{{site_name}}.access.log {{^wpredis}}{{^static}}rt_cache{{/static}}{{/wpredis}}{{#wpredis}}rt_cache_redis{{/wpredis}}; + error_log /var/log/nginx/{{site_name}}.error.log; + + {{#proxy}} + add_header X-Proxy-Cache $upstream_cache_status; + location / { + proxy_pass http://{{host}}:{{port}}; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + {{/proxy}} + + {{^proxy}} + {{^vma}}{{^rc}}root {{webroot}}/htdocs;{{/rc}}{{/vma}} + {{#vma}}root /var/www/22222/htdocs/vimbadmin/public;{{/vma}} + {{#rc}}root /var/www/roundcubemail/htdocs/;{{/rc}} + + {{^proxy}}index {{^static}}index.php{{/static}} index.html index.htm;{{/proxy}} + + {{#static}} + location / { + try_files $uri $uri/ =404; + } + {{/static}} + + {{^static}}include {{^hhvm}}{{#basic}}common/php7.conf;{{/basic}}{{#w3tc}}common/w3tc-php7.conf;{{/w3tc}}{{#wpfc}}common/wpfc-php7.conf;{{/wpfc}} {{#wpsc}}common/wpsc-php7.conf;{{/wpsc}}{{#wpredis}}common/redis-php7.conf;{{/wpredis}} {{/hhvm}}{{#hhvm}}{{#basic}}common/php-hhvm.conf;{{/basic}}{{#w3tc}}common/w3tc-hhvm.conf;{{/w3tc}}{{#wpfc}}common/wpfc-hhvm.conf;{{/wpfc}} {{#wpsc}}common/wpsc-hhvm.conf;{{/wpsc}}{{#wpredis}}common/redis-hhvm.conf;{{/wpredis}} {{/hhvm}} + {{#wpsubdir}}include common/wpsubdir.conf;{{/wpsubdir}}{{/static}} + {{#wp}}include common/wpcommon-php7.conf;{{/wp}} + {{^proxy}}include common/locations.conf;{{/proxy}} + {{^vma}}{{^rc}}include {{webroot}}/conf/nginx/*.conf;{{/rc}}{{/vma}} + {{/proxy}} +} diff --git a/ee/cli/templates/virtualconf.mustache b/ee/cli/templates/virtualconf.mustache index a77d9fb5..c7d3ac43 100644 --- a/ee/cli/templates/virtualconf.mustache +++ b/ee/cli/templates/virtualconf.mustache @@ -40,10 +40,8 @@ server { } {{/static}} - {{^static}}include {{^php7}}{{^hhvm}}{{#basic}}common/php.conf;{{/basic}}{{#w3tc}}common/w3tc.conf;{{/w3tc}}{{#wpfc}}common/wpfc.conf;{{/wpfc}}{{#wpsc}}common/wpsc.conf;{{/wpsc}}{{#wpredis}}common/redis.conf;{{/wpredis}}{{/hhvm}}{{#hhvm}}{{#basic}}common/php-hhvm.conf;{{/basic}}{{#w3tc}}common/w3tc-hhvm.conf;{{/w3tc}}{{#wpfc}}common/wpfc-hhvm.conf;{{/wpfc}}{{#wpsc}}common/wpsc-hhvm.conf;{{/wpsc}}{{#wpredis}}common/redis-hhvm.conf;{{/wpredis}}{{/hhvm}}{{/php7}}{{#php7}}{{^hhvm}}{{#basic}}common/php7.conf;{{/basic}}{{#w3tc}}common/w3tc-php7.conf;{{/w3tc}}{{#wpfc}}common/wpfc-php7.conf;{{/wpfc}}{{#wpsc}}common/wpsc-php7.conf;{{/wpsc}}{{#wpredis}}common/redis-php7.conf;{{/wpredis}}{{/hhvm}}{{#hhvm}}{{#basic}}common/php-hhvm.conf;{{/basic}}{{#w3tc}}common/w3tc-hhvm.conf;{{/w3tc}}{{#wpfc}}common/wpfc-hhvm.conf;{{/wpfc}}{{#wpsc}}common/wpsc-hhvm.conf;{{/wpsc}}{{#wpredis}}common/redis-hhvm.conf;{{/wpredis}}{{/hhvm}}{{/php7}} - {{#wpsubdir}}include common/wpsubdir.conf;{{/wpsubdir}}{{/static}} - {{^php7}}{{#wp}}include common/wpcommon.conf;{{/wp}}{{/php7}} - {{php7}}{{#wp}}include common/wpcommon-php7.conf;{{/wp}}{{/php7}} + {{^static}}include {{^hhvm}}{{#basic}}common/php.conf;{{/basic}}{{#w3tc}}common/w3tc.conf;{{/w3tc}}{{#wpfc}}common/wpfc.conf;{{/wpfc}} {{#wpsc}}common/wpsc.conf;{{/wpsc}}{{#wpredis}}common/redis.conf;{{/wpredis}} {{/hhvm}}{{#hhvm}}{{#basic}}common/php-hhvm.conf;{{/basic}}{{#w3tc}}common/w3tc-hhvm.conf;{{/w3tc}}{{#wpfc}}common/wpfc-hhvm.conf;{{/wpfc}} {{#wpsc}}common/wpsc-hhvm.conf;{{/wpsc}}{{#wpredis}}common/redis-hhvm.conf;{{/wpredis}} {{/hhvm}} {{#wpsubdir}}include common/wpsubdir.conf;{{/wpsubdir}}{{/static}} + {{#wp}}include common/wpcommon.conf;{{/wp}} {{^proxy}}include common/locations.conf;{{/proxy}} {{^vma}}{{^rc}}include {{webroot}}/conf/nginx/*.conf;{{/rc}}{{/vma}} {{/proxy}}