Skip to content

Commit fccff97

Browse files
harshadyeolaharshadyeola
committed
Merge branch 'release/v3.3.7'
2 parents ca2fc9e + 0f7dd3f commit fccff97

File tree

8 files changed

+158
-9
lines changed

8 files changed

+158
-9
lines changed

‎CHANGELOG.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
v 3.3.7 - Sep 9, 2015
2+
- EasyEngine + NGINX PLUS (http://docs.rtcamp.com/easyengine/nginx-plus/)
3+
14
v 3.3.6 - Sep 4, 2015
25
- Fix #611
36

‎docs/ee.8‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH ee 8 "EasyEngine (ee) version: 3.3.6" "Sept 4,2015" "EasyEngine"
1+
.TH ee 8 "EasyEngine (ee) version: 3.3.7" "Sep 9,2015" "EasyEngine"
22
.SH NAME
33
.B EasyEngine (ee)
44
\- Manage Nginx Based Websites.

‎ee/cli/plugins/site_functions.py‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ def setupwordpress(self, data):
310310
.format(data['ee_db_pass'],
311311
"\n\ndefine(\'WP_DEBUG\', false);",
312312
redissalt="\n\ndefine( \'WP_CACHE_KEY_SALT\', \'{0}:\' );"
313-
.format(ee_domain_name) if data['wpredis']
313+
.format(ee_domain_name) if data['wpredis']
314314
else ''),
315315
log=False
316316
):
@@ -352,7 +352,7 @@ def setupwordpress(self, data):
352352
" true);",
353353
"\n\ndefine(\'WP_DEBUG\', false);",
354354
redissalt="\n\ndefine( \'WP_CACHE_KEY_SALT\', \'{0}:\' );"
355-
.format(ee_domain_name) if data['wpredis']
355+
.format(ee_domain_name) if data['wpredis']
356356
else ''),
357357
log=False
358358
):
@@ -655,8 +655,19 @@ def site_package_check(self, stype):
655655
'wpsubdomain']:
656656
Log.debug(self, "Setting apt_packages variable for Nginx")
657657

658+
# Check if server has nginx-custom package
658659
if not EEAptGet.is_installed(self, 'nginx-custom'):
659-
apt_packages = apt_packages + EEVariables.ee_nginx
660+
# check if Server has nginx-plus installed
661+
if EEAptGet.is_installed(self, 'nginx-plus'):
662+
# do something
663+
# do post nginx installation configuration
664+
Log.info(self, "NGINX PLUS Detected ...")
665+
apt = ["nginx-plus"] + EEVariables.ee_nginx
666+
#apt_packages = apt_packages + EEVariables.ee_nginx
667+
stack.post_pref(apt, packages)
668+
669+
else:
670+
apt_packages = apt_packages + EEVariables.ee_nginx
660671
else:
661672
# Fix for Nginx white screen death
662673
if not EEFileUtils.grep(self, '/etc/nginx/fastcgi_params',

‎ee/cli/plugins/stack.py‎

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,23 @@ def post_pref(self, apt_packages, packages):
329329
out=ee_nginx)
330330
ee_nginx.close()
331331

332+
# Nginx-Plus does not have nginx package structure like this
333+
# So craeting directories
334+
if set(["nginx-plus"]).issubset(set(apt_packages)):
335+
Log.info(self,
336+
"Installing EasyEngine Configurations for" "NGINX PLUS")
337+
if not os.path.exists('/etc/nginx/sites-available'):
338+
Log.debug(self, 'Creating directory'
339+
'/etc/nginx/sites-available')
340+
os.makedirs('/etc/nginx/sites-available')
341+
342+
if not os.path.exists('/etc/nginx/sites-enabled'):
343+
Log.debug(self, 'Creating directory'
344+
'/etc/nginx/sites-available')
345+
os.makedirs('/etc/nginx/sites-enabled')
346+
347+
348+
332349
# 22222 port settings
333350
Log.debug(self, 'Writting the nginx configuration to '
334351
'file /etc/nginx/sites-available/'
@@ -427,7 +444,35 @@ def post_pref(self, apt_packages, packages):
427444
EEGit.add(self,
428445
["/etc/nginx"], msg="Adding Nginx into Git")
429446
EEService.reload_service(self, 'nginx')
430-
self.msg = (self.msg + ["HTTP Auth User Name: easyengine"]
447+
if set(["nginx-plus"]).issubset(set(apt_packages)):
448+
EEShellExec.cmd_exec(self, "sed -i -e 's/^user/#user/'"
449+
" -e '/^#user/a user"
450+
"\ www-data\;'"
451+
" /etc/nginx/nginx.conf")
452+
if not EEShellExec.cmd_exec(self, "cat /etc/nginx/"
453+
"nginx.conf | grep -q "
454+
"'/etc/nginx/sites-enabled'"):
455+
EEShellExec.cmd_exec(self, "sed -i '/\/etc\/"
456+
"nginx\/conf\.d\/\*"
457+
"\.conf/a \ include"
458+
"\ \/etc\/nginx\/sites-enabled"
459+
"\/*;' /etc/nginx/nginx.conf")
460+
461+
# EasyEngine config for NGINX plus
462+
data['version'] = EEVariables.ee_version
463+
Log.debug(self, 'Writting for nginx plus configuration'
464+
' to file /etc/nginx/conf.d/ee-plus.conf')
465+
ee_nginx = open('/etc/nginx/conf.d/ee-plus.conf',
466+
encoding='utf-8', mode='w')
467+
self.app.render((data), 'ee-plus.mustache',
468+
out=ee_nginx)
469+
ee_nginx.close()
470+
471+
print("HTTP Auth User Name: easyengine"
472+
+ "\nHTTP Auth Password : {0}".format(passwd))
473+
EEService.reload_service(self, 'nginx')
474+
else:
475+
self.msg = (self.msg + ["HTTP Auth User Name: easyengine"]
431476
+ ["HTTP Auth Password : {0}".format(passwd)])
432477

433478
if EEAptGet.is_installed(self,'redis-server'):
@@ -1571,7 +1616,13 @@ def install(self, packages=[], apt_packages=[], disp_msg=True):
15711616
Log.debug(self, "Setting apt_packages variable for Nginx")
15721617

15731618
if not EEAptGet.is_installed(self, 'nginx-custom'):
1574-
apt_packages = apt_packages + EEVariables.ee_nginx
1619+
if not EEAptGet.is_installed(self, 'nginx-plus'):
1620+
apt_packages = apt_packages + EEVariables.ee_nginx
1621+
else:
1622+
Log.info(self, "NGINX PLUS Detected ...")
1623+
apt = ["nginx-plus"] + EEVariables.ee_nginx
1624+
#apt_packages = apt_packages + EEVariables.ee_nginx
1625+
self.post_pref(apt, packages)
15751626
else:
15761627
Log.debug(self, "Nginx already installed")
15771628
Log.info(self, "Nginx already installed")

‎ee/cli/templates/ee-plus.mustache‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
##
2+
# EasyEngine Settings
3+
##
4+
5+
6+
tcp_nopush on;
7+
tcp_nodelay on;
8+
types_hash_max_size 2048;
9+
10+
server_tokens off;
11+
reset_timedout_connection on;
12+
add_header X-Powered-By "EasyEngine {{ version }}";
13+
add_header rt-Fastcgi-Cache $upstream_cache_status;
14+
15+
# Limit Request
16+
limit_req_status 403;
17+
limit_req_zone $binary_remote_addr zone=one:10m rate=1r/s;
18+
19+
# Proxy Settings
20+
# set_real_ip_from proxy-server-ip;
21+
# real_ip_header X-Forwarded-For;
22+
23+
fastcgi_read_timeout 300;
24+
client_max_body_size 100m;
25+
26+
##
27+
# SSL Settings
28+
##
29+
30+
ssl_session_cache shared:SSL:20m;
31+
ssl_session_timeout 10m;
32+
ssl_prefer_server_ciphers on;
33+
ssl_ciphers HIGH:!aNULL:!MD5:!kEDH;
34+
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
35+
36+
##
37+
# Basic Settings
38+
##
39+
server_names_hash_bucket_size 16384;
40+
# server_name_in_redirect off;
41+
42+
43+
##
44+
# Logging Settings
45+
##
46+
47+
access_log /var/log/nginx/access.log;
48+
error_log /var/log/nginx/error.log;
49+
50+
# Log format Settings
51+
log_format rt_cache '$remote_addr $upstream_response_time $upstream_cache_status [$time_local] '
52+
'$http_host "$request" $status $body_bytes_sent '
53+
'"$http_referer" "$http_user_agent" "$request_body"';
54+
55+
##
56+
# Gzip Settings
57+
##
58+
59+
gzip on;
60+
gzip_disable "msie6";
61+
62+
gzip_vary on;
63+
gzip_proxied any;
64+
gzip_comp_level 6;
65+
gzip_buffers 16 8k;
66+
gzip_http_version 1.1;
67+
gzip_types
68+
application/atom+xml
69+
application/javascript
70+
application/json
71+
application/rss+xml
72+
application/vnd.ms-fontobject
73+
application/x-font-ttf
74+
application/x-web-app-manifest+json
75+
application/xhtml+xml
76+
application/xml
77+
font/opentype
78+
image/svg+xml
79+
image/x-icon
80+
text/css
81+
text/plain
82+
text/x-component
83+
text/xml
84+
text/javascript;

‎ee/core/variables.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class EEVariables():
1212
"""Intialization of core variables"""
1313

1414
# EasyEngine version
15-
ee_version = "3.3.6"
15+
ee_version = "3.3.7"
1616

1717

1818
# EasyEngine packages versions

‎install‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fi
4848
# Define variables for later use
4949
ee_branch=$1
5050
readonly ee_version_old="2.2.3"
51-
readonly ee_version_new="3.3.6"
51+
readonly ee_version_new="3.3.7"
5252
readonly ee_log_dir=/var/log/ee/
5353
readonly ee_install_log=/var/log/ee/install.log
5454
readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}')

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
os.system("git config --global user.email {0}".format(ee_email))
5555

5656
setup(name='ee',
57-
version='3.3.6',
57+
version='3.3.7',
5858
description=long_description,
5959
long_description=long_description,
6060
classifiers=[],

0 commit comments

Comments
 (0)