Skip to content

Commit 1c2135d

Browse files
andyoneandyone
authored
Merge pull request #26 from essentialkaos/develop
Version 1.11.5.1
2 parents 56bc40f + a6c2e72 commit 1c2135d

File tree

4 files changed

+68
-25
lines changed

4 files changed

+68
-25
lines changed

‎SOURCES/webkaos.conf‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,31 @@ http {
3939
include /etc/webkaos/mime.types;
4040
default_type application/octet-stream;
4141

42-
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
43-
'$status $body_bytes_sent "$http_referer" '
44-
'"$http_user_agent" "$http_x_forwarded_for"';
42+
log_format main '[$request_id] $remote_addr - $remote_user [$time_local] "$request" '
43+
'$status $body_bytes_sent "$http_referer" '
44+
'"$http_user_agent" "$http_x_forwarded_for"';
4545

46-
log_format extended '$remote_addr - [$time_local] "$request" '
47-
'$status $body_bytes_sent '
48-
'"$http_x_forwarded_for" "$http_referer" $host '
49-
'$request_time $upstream_response_time '
50-
'$upstream_addr - $upstream_status';
46+
log_format extended '[$request_id] $remote_addr - [$time_local] "$request" '
47+
'$status $body_bytes_sent '
48+
'"$http_x_forwarded_for" "$http_referer" $host '
49+
'$request_time $upstream_response_time '
50+
'$upstream_addr - $upstream_status';
5151

52-
log_format reflog '$remote_addr - $remote_user [$time_local] '
52+
log_format reflog '[$request_id] $remote_addr - $remote_user [$time_local] '
5353
'"$request" $status $bytes_sent '
5454
'"$http_referer" "$http_user_agent"';
5555

56-
log_format timed_combined '$remote_addr - $remote_user [$time_local] '
56+
log_format timed_combined '[$request_id] $remote_addr - $remote_user [$time_local] '
5757
'"$request" $status $body_bytes_sent '
5858
'"$http_x_forwarded_for" "$http_referer" $host '
5959
'"$http_referer" "$http_user_agent" '
6060
'$request_time $upstream_response_time';
6161

62-
log_format vhost_ip_full_format '$remote_addr - $remote_user [$time_local] $host $server_addr $request '
62+
log_format vhost_ip_full_format '[$request_id] $remote_addr - $remote_user [$time_local] $host $server_addr $request '
6363
'$status $body_bytes_sent "$http_referer" '
64-
'"$http_user_agent" "$http_x_forwarded_for" $request_time-$upstream_response_time';
64+
'"$http_user_agent" "$http_x_forwarded_for" $request_time $upstream_response_time';
6565

66-
access_log /var/log/webkaos/access.log main;
66+
access_log /var/log/webkaos/access.log main;
6767

6868
sendfile on;
6969
tcp_nopush on;
@@ -121,6 +121,11 @@ http {
121121
resolver 8.8.4.4 8.8.8.8 valid=300s;
122122
resolver_timeout 10s;
123123

124+
##############################################################################
125+
126+
# Header with unique request identifier.
127+
add_header X-Request-ID "$request_id";
128+
124129
##############################################################################
125130

126131
# Main configuration for pagespeed. Pagespeed globally disabled, include

‎SOURCES/webkaos.init‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ conf_file=${CONF_FILE:-/etc/webkaos/webkaos.conf}
4040
cache_dir=${CACHE_DIR:-/var/cache/webkaos}
4141
log_dir=${LOG_DIR:-/var/log/webkaos}
4242
pagespeed_cache=${PAGESPEED_CACHE:-/var/cache/webkaos/pagespeed}
43+
ssl_dir=${SSL_DIR:-/etc/webkaos/ssl}
4344
dh_param=${DH_PARAM:-/etc/webkaos/ssl/dhparam.pem}
4445

4546
delay_upgrade=30
@@ -140,10 +141,21 @@ gendhp() {
140141

141142
openssl dhparam -out $dh_param $size &> /dev/null
142143

143-
local retcode=$?
144-
kv.showStatusMessage "$retcode"
144+
if [[ $? -ne 0 ]] ; then
145+
kv.showStatusMessage "$ACTION_ERROR"
146+
return $ACTION_ERROR
147+
fi
148+
149+
chmod 600 $dh_param &> /dev/null
150+
151+
if [[ $? -ne 0 ]] ; then
152+
kv.showStatusMessage "$ACTION_ERROR"
153+
return $ACTION_ERROR
154+
fi
145155

146-
return $retcode
156+
kv.showStatusMessage "$ACTION_OK"
157+
158+
return $ACTION_OK
147159
}
148160

149161
restart() {
@@ -248,6 +260,16 @@ preStartServiceHandler() {
248260
kv.show "-------------------------------------------------------------------------------" $GREY
249261
return $ACTION_ERROR
250262
fi
263+
264+
local file file_perms
265+
266+
for file in $(ls -1 $ssl_dir) ; do
267+
file_perms=$(getFilePerms $ssl_dir/$file)
268+
269+
if [[ "$file_perms" != "600" && "$file_perms" != "400" ]] ; then
270+
kv.warn "File $ssl_dir/$file have weak permissions. Please change permissions to 400 or 600."
271+
fi
272+
done
251273
}
252274

253275
startServiceHandler() {
@@ -370,6 +392,10 @@ isDHPGenRequired() {
370392
return 1
371393
}
372394

395+
getFilePerms() {
396+
stat -c '%a' $1
397+
}
398+
373399
###############################################################################
374400

375401
prepare

‎webkaos-centos6.spec‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
%define service_name %{name}
4444
%define service_home %{_cachedir}/%{service_name}
4545

46-
%define boring_commit 4c0e6c64b6866926f96576bc8e8ea8849f018159
46+
%define boring_commit 11a7b3c2d902ddb039e42fe19933e2a942f585f0
4747
%define psol_ver 1.11.33.4
48-
%define lua_module_ver 0.10.6
49-
%define mh_module_ver 0.31
48+
%define lua_module_ver 0.10.7
49+
%define mh_module_ver 0.32
5050
%define pcre_ver 8.39
5151
%define zlib_ver 1.2.8
5252

@@ -59,7 +59,7 @@
5959
Summary: Superb high performance web server
6060
Name: webkaos
6161
Version: 1.11.5
62-
Release: 0%{?dist}
62+
Release: 1%{?dist}
6363
License: 2-clause BSD-like license
6464
Group: System Environment/Daemons
6565
Vendor: Nginx / Google / CloudFlare / ESSENTIALKAOS
@@ -506,6 +506,12 @@ fi
506506
###############################################################################
507507

508508
%changelog
509+
* Wed Nov 09 2016 Anton Novojilov <andy@essentialkaos.com> - 1.11.5-1
510+
- BoringSSL updated to latest version
511+
- Lua module updated to 0.10.7
512+
- More Headers module updated to 0.32
513+
- Added request_id to log output and X-Request-ID header
514+
509515
* Fri Oct 14 2016 Anton Novojilov <andy@essentialkaos.com> - 1.11.5-0
510516
- Nginx updated to 1.11.5
511517
- OpenSSL replaced by BoringSSL

‎webkaos-centos7.spec‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
%define service_name %{name}
4444
%define service_home %{_cachedir}/%{service_name}
4545

46-
%define boring_commit 4c0e6c64b6866926f96576bc8e8ea8849f018159
46+
%define boring_commit 11a7b3c2d902ddb039e42fe19933e2a942f585f0
4747
%define psol_ver 1.11.33.4
48-
%define lua_module_ver 0.10.6
49-
%define mh_module_ver 0.31
48+
%define lua_module_ver 0.10.7
49+
%define mh_module_ver 0.32
5050
%define pcre_ver 8.39
5151
%define zlib_ver 1.2.8
5252

@@ -59,7 +59,7 @@
5959
Summary: Superb high performance web server
6060
Name: webkaos
6161
Version: 1.11.5
62-
Release: 0%{?dist}
62+
Release: 1%{?dist}
6363
License: 2-clause BSD-like license
6464
Group: System Environment/Daemons
6565
Vendor: Nginx / Google / CloudFlare / ESSENTIALKAOS
@@ -93,7 +93,7 @@ Patch0: %{name}.patch
9393
Patch1: mime.patch
9494
# https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__1.11.5_dynamic_tls_records.patch
9595
Patch2: %{name}-dynamic-tls-records.patch
96-
# https://github.com/ajhaydock/BoringNginx/blob/master/1.11.4/src/boring.patch
96+
# https://github.com/ajhaydock/BoringNginx/blob/master/patches/1.11.5.patch
9797
Patch3: boring.patch
9898

9999
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -502,6 +502,12 @@ fi
502502
###############################################################################
503503

504504
%changelog
505+
* Wed Nov 09 2016 Anton Novojilov <andy@essentialkaos.com> - 1.11.5-1
506+
- BoringSSL updated to latest version
507+
- Lua module updated to 0.10.7
508+
- More Headers module updated to 0.32
509+
- Added request_id to log output and X-Request-ID header
510+
505511
* Fri Oct 14 2016 Anton Novojilov <andy@essentialkaos.com> - 1.11.5-0
506512
- Nginx updated to 1.11.5
507513
- OpenSSL replaced by BoringSSL

0 commit comments

Comments
 (0)