nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 20:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
264,706 Commits 190 Branches 125 Tags 8 GiB
5faea624d5
Commit Graph

301 Commits

Author SHA1 Message Date
xeji
176891c0ad
Merge pull request #44467 from Izorkin/nginx-modules 
Nginx modules
 2018-08-05 22:20:05 +02:00
Johannes Frankenau
c481117673 nginxMainline: 1.15.1 -> 1.15.2 (#44431) 2018-08-04 21:06:35 +02:00
Izorkin
e0de8354b9 nginxModules.lua-upstream: init at v0.07 2018-08-04 20:54:36 +03:00
Izorkin
29b3e11541 nginxModules.url: init at rev 9299816 2018-08-04 20:54:36 +03:00
Izorkin
a5674cebb9 nginxModules.sysguard: init at rev e512897 2018-08-04 20:54:35 +03:00
Izorkin
9100091f3f nginxModules.stream-sts: init at v0.1.1 2018-08-04 20:54:35 +03:00
Izorkin
9958868dfd nginxModules.sts: init at v0.1.1 2018-08-04 20:54:35 +03:00
Izorkin
07e7966d3b nginxModules.upstream-tarantool: init at v2.7 2018-07-29 14:54:55 +03:00
Izorkin
ca37481d25 nginxModules.push-stream: init at v0.5.4 2018-07-29 14:54:47 +03:00
Izorkin
aa68f56c0a nginxModules.vts: init at v0.1.18 2018-07-29 14:54:08 +03:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Izorkin
e76f382c75 nginxModules: sorting of modules alphabetically 2018-07-16 03:44:32 +00:00
Franz Pletz
0a5186a7cb
Merge pull request #43580 from Izorkin/nginx-modules 
Update nginx modules
 2018-07-15 21:56:09 +00:00
Izorkin
3a5d104a33 nginxModules.develkit: update to v0.3.1rc1 2018-07-16 00:25:36 +03:00
Izorkin
75b2940145 nginxModules.upstream-check: update to rev 9aecf15 2018-07-16 00:25:20 +03:00
Izorkin
c96d49733a nginxModules.statsd: update to rev b970e40 2018-07-16 00:25:01 +03:00
Izorkin
04eb0731fb nginxModules.pam: update to v1.5.1 2018-07-16 00:24:45 +03:00
Izorkin
eff0def7dc nginxModules.set-misc: update to v0.32 2018-07-16 00:24:27 +03:00
Izorkin
ea52907348 nginxModules.lua: update to v0.10.13 2018-07-16 00:24:14 +03:00
Izorkin
8584845aa1 nginxModules.moreheaders: update to v0.33 2018-07-16 00:23:41 +03:00
Izorkin
a16eee878f nginxModules.ipscrub: update to v1.0.1 2018-07-16 00:22:54 +03:00
Izorkin
11653f8e6b nginxModules.sla: init at 7778f01 2018-07-15 20:29:57 +00:00
Franz Pletz
3239ef84ea
nginxMainline: 1.13.12 -> 1.15.1 2018-07-15 21:41:45 +02:00
Izorkin
bfb393f55e nginx-fancyindex: init at 0.4.3 2018-07-15 20:07:34 +03:00
Matthew Bauer
af56538c89
Merge pull request #42687 from nh2/nginx-debug-build 
nginx: Flag to build with debugging and parallel builds
 2018-07-05 22:11:51 -04:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676) 
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
 2018-06-28 20:43:35 +02:00
Niklas Hambüchen
c834fb39c3 nginx: Enable parallel building 2018-06-28 01:35:41 +02:00
Niklas Hambüchen
94d97fe290 nginx: Add withDebug argument 2018-06-28 01:35:41 +02:00
Will Dietz
516c5f54ed ngx_brotli: 0.1.1 -> 0.1.2 
Fixes socket closing issues
(only happened in some circumstances AFAICT).
 2018-06-18 10:41:24 -05:00
Johannes Frankenau
db5ab167df nginxModules.ipscrub: init at 99230f6 2018-05-13 17:31:54 +02:00
Michael Raskin
36f9b216eb nginxStable: 1.12.2 -> 1.14.0 2018-05-02 02:46:52 +02:00
Michael Raskin
18d73458c8 nginxMainline: 1.13.9 -> 1.13.12 2018-05-02 02:46:52 +02:00
Will Dietz
bec9726946 ngx_brotli: -> 0.1.1 2018-04-24 12:55:16 -05:00
Will Dietz
0fdc4cb94b ngx_brotli: update for fixes, zero copy. 2018-03-21 15:15:50 -05:00
Tuomas Tynkkynen
2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
 2018-03-13 23:04:18 +02:00
John Ericson
eeb8419c6a ceph: Fix --with-file-aio logic for new meta.platforms and cross 2018-03-12 18:55:41 -04:00
Jan Malakhovski
7079e744d4 Merge branch 'master' into staging 
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
 2018-03-10 20:38:13 +00:00
Franz Pletz
94db63f5d4
nginxMainline: 1.13.8 -> 1.13.9 2018-03-05 15:49:07 +01:00
Will Dietz
40b14109d3 nginx/modules: brotli: no-op bump to latest that uses 1.0.2 as submodule 
We have it use our system copy regardless, but might as well.

(yes, hash does not change, since we don't fetch submodule here)
 2018-02-20 14:08:22 -06:00
Will Dietz
df9ebaf8c7 nginx/modules: use eustas' brotli module, google one is abandoned 
This fork is also used by FreeBSD as of Dec 2017:
https://svnweb.freebsd.org/ports?view=revision&revision=455560

See also:
https://github.com/google/ngx_brotli/issues/62
 2018-02-20 14:01:18 -06:00
Will Dietz
06e50006d4 nginxModules.pagespeed: be consistent about rev 
Yes hash doesn't change, stable is copy of beta used previously.
 2018-02-13 15:17:21 -06:00
Will Dietz
75068a6770 psol, ngx_pagespeed: 1.13.35.1 -> 1.13.35.2 2018-01-31 05:46:52 +09:00
adisbladis
67906744ec
Merge pull request #33658 from dtzWill/update/ngx_pagespeed 
ngx_pagespeed, psol: 1.11.33.4 -> 1.13.35.1
 2018-01-10 20:04:59 +08:00
Will Dietz
be2e01f8a0 ngx_pagespeed, psol: 1.11.33.4 -> 1.13.35.1 
Fixes build when used with nginxMainline.

(FWIW, 1.11.33.4 is from 2016-09-15)
 2018-01-09 10:57:17 -06:00
Will Dietz
0bbcfb0d6d nginxMainline: 1.13.6 -> 1.13.8 
See http://nginx.org/en/CHANGES
 2018-01-09 10:55:52 -06:00
Izorkin
37d66db7f9 modsecurity-nginx: 2017-08-23 -> 1.0.0 Stable 2017-12-21 23:41:38 +03:00
Jörg Thalheim
bc97af0b31
Merge pull request #32449 from Izorkin/ModSecurity-nginx 
nginxModules.ModSecurity-beta: 2017-06-17 -> 2017-08-23
 2017-12-16 23:21:12 -08:00
Izorkin
2c7912ce49 ModSecurity-nginx: update revision 2017-12-09 23:03:12 +03:00
Andreas Rammhold
a004f9f806
nginxModules.rtmp: v1.1.11 -> v1.2.1 
adds support for gcc-7 and fixes nginx for #31747
 2017-12-04 16:52:39 +01:00
Orivej Desh
6de0380378 nginxModules.brotli: 2015-11-18 -> 2016-12-02 
This version bundles brotli.
 2017-11-29 00:59:46 +00:00
Izorkin
cf6e90c104 nginx: add ModSecurity Nginx Connector (#28545) 
nginx: add ModSecurity Nginx Connector
 2017-11-26 07:57:19 -05:00
Vladimír Čunát
f90c468ea5
nginxModules.moreheaders: fix source hash 
An amended git tag, apparently.  There are only changes in documentation
and whitespace changes in code.  Sigh.  Uncovered by c3255fe8ec.
 2017-10-31 23:03:34 +01:00
Franz Pletz
0f0fcf84ce
nginx: 1.12.1 -> 1.12.2 2017-10-24 16:06:51 +02:00
Franz Pletz
0f01f8b882
nginxMainline: 1.13.5 -> 1.13.6 2017-10-14 20:07:27 +02:00
Franz Pletz
f03462eda8
nginxMainline: 1.13.4 -> 1.13.5 2017-10-02 20:24:48 +02:00
Vaibhav Sagar
dea2affe6c nginxModules.echo: 0.57 -> 0.61 
This fixes #29555.
 2017-09-21 11:01:35 +00:00
Vaibhav Sagar
70eb31c853 nginx-modules: remove unused fetchpatch 2017-09-17 19:25:50 +08:00
rnhmjoj
d0aa64a8e2
lua-nginx-module: 0.10.5 -> 0.10.10 2017-09-14 22:18:57 +02:00
Daiderd Jordan
734788b71d
nginx: disable pie on darwin 2017-09-12 22:42:04 +02:00
José Luis Lafuente
eb159a0e5a
nignx-dav-ext-module: 0.0.3 -> 0.1.0 2017-08-26 18:07:18 +02:00
Pascal Bach
ec779fb2c3 nginx: enable stream support by default 
TCP proxying should be a default feature of nginx
 2017-08-21 20:30:41 +02:00
Pascal Bach
6de00c1cb2 nginx: add possibility to compile reverse proxy with mail support 2017-08-21 20:30:41 +02:00
Pascal Bach
1d8412d17a nginx: add additional features when streams are enabled 
This allows nginx to work as a TCP load balancer including
TLS and geo IP routing support
 2017-08-21 20:30:41 +02:00
Pascal Bach
e309c318c6 nginx: enable additional compile flags 
These flags can increase performance.

They are also enabled by default on Debian and Archlinux
 2017-08-21 20:30:41 +02:00
Pascal Bach
12e0e9d31c nginx: remove deprecated ipv6 compile flag 
The build process for both mainline and stable print a warning that
"--with-ipv6" is deprecated
 2017-08-21 20:30:41 +02:00
Franz Pletz
6fdf8b3f77
nginxMainline: 1.13.3 -> 1.13.4 2017-08-11 17:32:23 +02:00
Franz Pletz
6e1aaeacfc
nginx: 1.12.0 -> 1.12.1 for CVE-2017-7529 2017-07-14 00:03:41 +02:00
Franz Pletz
af70b8fc23
nginxMainline: 1.13.2 -> 1.13.3 for CVE-2017-7529 2017-07-14 00:03:41 +02:00
Franz Pletz
c71989022e
nginxMainline: 1.13.1 -> 1.13.2 2017-07-05 19:04:17 +02:00
Franz Pletz
b74866b9a7
nginxMainline: 1.13.0 -> 1.13.1 2017-06-06 03:59:20 +02:00
Robin Gloster
4a83c099e1
nginx: 1.10.3 -> 1.12.0 2017-05-23 11:37:57 +02:00
Robin Gloster
4f51da2ff7
nginx-rtmp-module: 1.1.9 -> 1.1.11 2017-05-23 11:37:57 +02:00
Vaibhav Sagar
d575102556 nginx: remove syslog module 
This module has not been required for over 2 years. See https://github.com/yaoweibin/nginx_syslog_patch/issues/15
 2017-05-04 09:39:19 +08:00
jammerful
da5bc79469 nginx: Add Shibboleth Module 
Also add nginxShibboleth package
 2017-05-01 17:09:00 -04:00
Franz Pletz
32401d17c6
nginxMainline: 1.11.13 -> 1.13.0 2017-04-27 18:20:42 +02:00
Franz Pletz
73f04ddd57
nginxMainline: 1.11.10 -> 1.11.13 2017-04-11 19:57:28 +02:00
Franz Pletz
c13922f012
nginx: explicitly use stable version 
Also updates the documention of the NixOS option `services.nginx.package`
that upstream recommends using the mainline version instead.

Fixes #21665.
 2017-03-20 20:04:09 +01:00
Franz Pletz
e18bec1e3c
nginxMainline: 1.11.9 -> 1.11.10 2017-02-15 00:42:29 +01:00
Michael Raskin
846007b8db nginx: 1.10.2 -> 1.10.3 2017-02-01 19:28:45 +01:00
Franz Pletz
f1ba2c8d3b
nginxMainline: 1.11.8 -> 1.11.9 2017-01-26 01:04:49 +01:00
3noch
0d4d401b7f
nginx: add PageSpeed module (Linux only) 2017-01-10 17:26:50 -05:00
3noch
7f99fd086b
nginx: add 'cache_purge' module for purging FastCGI cache 2017-01-06 11:27:48 -05:00
Michael Raskin
ca8d3de1d2 nginx: 1.11.7 -> 1.11.8 2017-01-02 20:18:50 +01:00
Corbin
ca2fa4416e nginx: Allow GD to be optional. 
This commit permits incantations like `pkgs.nginx.override { gd = null; }` to
produce a slimmed-down nginx.

When used, this functionality removes a pile of stuff from nginx's closure.
The resulting nginx's closure:

    $ nix-store -q -R /nix/store/wk3h0a4dmdmjmxkbd0q09iw0wfq0yzpz-nginx-1.10.2 | wc -l
    12
    $ nix-store -q -R /nix/store/gpcx77anqrj05qz0mrwm7hf4wgxry5py-nginx-1.10.2 | wc -l
    24
 2016-12-26 10:24:58 -08:00
Franz Pletz
d3be9a50e0
nginxMainline: 1.11.6 -> 1.11.7 2016-12-13 21:39:31 +01:00
Franz Pletz
a04a4b2a6a
nginxMainline: 1.11.5 -> 1.11.6 2016-11-23 13:23:33 +01:00
Franz Pletz
323acff8e6
nginxMainline: 1.11.4 -> 1.11.5 2016-10-24 18:10:14 +02:00
Franz Pletz
4ae2189d8c
nginx: 1.10.1 -> 1.10.2 2016-10-24 18:10:14 +02:00
Tim Steinbach
f091686a18
nginxMainline: 1.11.3 -> 1.11.4 2016-09-23 08:20:03 -04:00
Matt Billenstein
cba2dd0044 nginx modules: update rtmp to 1.1.9 fixing build failures against 1.11.x 2016-09-08 16:21:13 -07:00
Matt Billenstein
6ce8575a2e nginx modules: update ngx_devel_kit to 0.3.0 2016-09-08 16:20:27 -07:00
Matt Billenstein
ca60da8031 nginx module: update statsd to support 1.10.1 -- the zebrafishlabs github repo 
seems dead
 2016-09-08 15:59:11 -07:00
Matt Billenstein
a49133b07f nginx module: add upstream check module 2016-09-08 12:02:15 -07:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Michael Raskin
d1435913cf nginx: 1.11.2 -> 1.11.3 2016-08-11 17:57:35 +02:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Franz Pletz
b5daad4268 nginx: refactor and add mainline version 
Upstream calls the unstable version mainline.
 2016-07-19 01:20:49 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Franz Pletz
9eec064355 nginx: 1.10.0 -> 1.10.1 (security) 
Fixes CVE-2016-4450.
 2016-07-10 10:48:11 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Teo Klestrup Röijezon
3f5186fd54 nginxModules.lua: 0.10.0 -> 0.10.5 2016-06-05 12:48:06 +02:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Tuomas Tynkkynen
d298b52fd3 treewide: Make explicit that 'dev' output of aprutil is used 2016-05-19 10:00:25 +02:00
Tuomas Tynkkynen
29694b43b6 treewide: Make explicit that 'dev' output of apr is used 2016-05-19 10:00:24 +02:00
Tuomas Tynkkynen
16cc4ac83b treewide: Make explicit that 'dev' output of apacheHttpd is used 2016-05-19 10:00:23 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Tobias Geerinckx-Rice
ab6e0861d4
nginx: restore .upstream files 
07d9de713a
 2016-05-06 15:37:22 +02:00
Tobias Geerinckx-Rice
b0f8349d95
nginxUnstable: alias to nginx until next unstable release 2016-05-06 13:47:36 +02:00
Tobias Geerinckx-Rice
07d9de713a
nginx: remove .upstream files 2016-05-06 13:47:12 +02:00
Tobias Geerinckx-Rice
959472a824
nginx: 1.8.1 -> 1.10.0 
Changes: http://nginx.org/en/CHANGES-1.10
 2016-05-03 20:05:57 +02:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Michael Raskin
c82272fdc0 nginxUnstable: 1.9.11 -> 1.9.14 2016-04-13 14:47:04 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Luca Bruno
dcfca100ec Merge pull request #12525 from knupfer/ngx_brotli 
add nginxModules.brotli
 2016-03-11 11:05:21 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Franz Pletz
fedf31660d nginx: Rmove custom hardening, now enabled by default 2016-03-08 00:39:07 +01:00
Franz Pletz
cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
Michael Raskin
708c6094c5 nginx, nginxUnstable: hardening: only use when the compiler is gcc 2016-03-04 16:57:47 +01:00
Michael Raskin
7b9684a5b5 nginx, nginxUnstable: enable hardening. Flags as recommended by @arno01 (Andrey Arapov) in #7190 2016-03-04 16:54:37 +01:00
Robin Gloster
310fa56788 nginx: enable pie hardening 2016-02-26 16:38:26 +00:00
Michael Raskin
9e7c28cb56 nginxUnstable: 1.9.10 -> 1.9.11 2016-02-14 21:17:07 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Rok Garbas
cf40e86fb0 nginx: 1.8.0->1.8.1, 1.9.9->1.9.10 2016-01-26 18:12:01 +01:00
Benjamin Staffin
9bad9c8bf3 nginx: add statsd to the available modules 2016-01-23 17:25:49 -05:00
knupfer
8e604f7937 nginxModules.brotli: init at 788615e 2016-01-21 22:14:39 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Christoph Hrdinka
a3e3b76363 nginxModules.lua: 0.9.19 -> 0.10.0 2016-01-16 16:35:07 +01:00
Michael Raskin
ab3277e68a nginxUnstable: 1.9.7 -> 1.9.9 2016-01-01 12:30:17 +03:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Teo Klestrup Röijezon
53441bcc93 nginx: 1.9.4 -> 1.9.7, fixes #11515 2015-12-07 14:56:27 +01:00
Christoph Hrdinka
1391ca3af1 nginxModules.lua: 0.9.16 -> 0.9.19 2015-12-02 23:06:34 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Nikolay Amiantov
d2fc6e6a02 nginxModules.pam: init at 1.4 2015-10-19 16:46:09 +03:00
Nikolay Amiantov
9424238d14 nginx: factor out modules in a separate file 2015-10-19 16:46:02 +03:00
Vladimír Čunát
38313d5d87 libxml2,libxslt: split into multiple outputs 
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
 2015-10-05 13:44:16 +02:00
Jaka Hudoklin
ea4850ca64 Merge pull request #10023 from offlinehacker/pkgs/modsecurity/add 
modsecurity: add modsecurity, and create nginx plugin
 2015-09-30 00:19:38 +02:00
Jaka Hudoklin
46828582ab nginx: add support for modescurity 2015-09-23 20:35:28 +02:00
Hoang Xuan Phu
4ac4f2dcd9 nginx: add an option to build the stream module 2015-09-22 13:09:11 +08:00
Hoang Xuan Phu
942d2798c5 nginx: bump lua module to fix build error 
(https://github.com/openresty/lua-nginx-module/pull/500)
 2015-09-22 13:08:42 +08:00
Austin Seipp
860d720940 nixpkgs: nginxUnstable 1.9.3 -> 1.9.4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:17:17 -05:00
Austin Seipp
131e41191b nixpkgs: nginxUnstable 1.9.2 -> 1.9.3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-20 13:52:33 -05:00
Rickard Nilsson
7e021a0fd6 nginx package: Allow adding arbitrary modules 2015-07-12 00:49:18 +02:00
Rickard Nilsson
ef5dafd66d lua-nginx-module: Update from v0.9.16rc1 to v0.9.16 2015-07-12 00:49:18 +02:00
Michael Raskin
7c5129706f nginx unstable: update 1.9.1 -> 1.9.2 2015-07-05 00:32:53 +03:00
Michael Raskin
ed145cb07f Update Nginx unstable 2015-06-14 11:22:23 +03:00
Rickard Nilsson
a92271f195 lua-nginx-module: Update from 0.9.15 to 0.9.16rc1 
This fixes the build that has been broken since nginx was bumped to 1.8.0
 2015-05-26 08:05:26 +02:00
John Wiegley
5ac9e87b1b nginx: Fix build for Darwin (no AIO there) 2015-05-21 12:42:06 -05:00
Michael Raskin
f6e852554c Update Nginx 2015-05-10 13:36:43 +03:00