Bump version to 0.39.0

5 files changed, 243 insertions, 111 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47742da7c810..9a03c1606b1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Tue Mar  8 16:57:14 UTC 2016
 pkgbase = zotonic
 	pkgdesc = Content management system (web-CMS) server written in Erlang
-	pkgver = 0.14.0
+	pkgver = 0.39.0
 	pkgrel = 1
 	url = http://zotonic.com/
 	install = zotonic.install
@@ -10,24 +8,21 @@ pkgbase = zotonic
 	license = Apache
 	depends = erlang-nox
 	depends = postgresql
+	depends = git
 	depends = imagemagick
 	optdepends = perl-image-exiftool: Enable image autorotation
 	optdepends = nginx: Proxy Zotonic with nginx
 	optdepends = varnish: Speed up Zotonic with Varnish
 	backup = etc/zotonic/config
 	backup = etc/zotonic/erlang.config
-	source = https://github.com/zotonic/zotonic/archive/0.14.0.tar.gz
+	source = https://github.com/zotonic/zotonic/archive/0.39.0.tar.gz
 	source = zotonic.service
 	source = config
 	source = erlang.config
-	md5sums = 2f3b6c7bb2f1608acbdb4e4a558d7c63
-	md5sums = a6f0f70d2a2af5ff0d0cfaf1531f6ed0
-	md5sums = 7904af22bf674471c212bde82a2cdcb6
-	md5sums = 4f09c0c994f5a17844b8ed999d3e7e39
-	sha512sums = ecc5a2bc0c19bce98707960303ddd34aabd9f35fbf720b51ec31558b6debd7ee9ccb5332190d40c73d2a7866ee82914c96acc4d6ad677619b1e55da275686a43
+	sha512sums = 11e14fd088b988dc81bdb237058537cfb9bdeeb6c4ab8b7b142bf80a86f47688a149169981224ea8d1af906add54332d59f253cfaf74e6aee244418034cf7902
 	sha512sums = 0768bbbf07a3448429ae06e30a13751fc8060b3a7c626623731931d962664f542f13c93967b35303e3f0d8afdf848b4b83d310879d6deb1a7303cdc04f909953
-	sha512sums = 62213581acaadcefacf15253175e27135bcc964768a061624a04ebcb3dc6e761ce3629017ce01286b741884fb0b23c4ebfcb6508f14200d99ecdb4f4860bd000
-	sha512sums = a6e5069e087a314053dab3774ecb123b5d5888c561430ecf02be34b72b3917c513d076323667188fde0ee6c2014e44f41b3a0a4b8fd79dd17c5523425f6979d8
+	sha512sums = 73aa92b9666ac8bcc0b8988355eede2294da272825166cf4a493f52d158caa4b0a2b6c5cc7890f19702e9fec084e78287f7bdb6764602b2f033e85ffa2efeead
+	sha512sums = 33e6402e7e2f4926249eac5b7c199985b620916907168408c752bcd659640bd3e61cdb4d75382ee22376ccf079d235acd678c00a7f9084be7bc7c536e943d0c5
 
 pkgname = zotonic
 
diff --git a/PKGBUILD b/PKGBUILD
index 1d81b188e827..ab7426d63855 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: jdarch <jda -dot- cloud -plus- archlinux -at- gmail -dot- com>
 
 pkgname=zotonic
-pkgver=0.14.0
+pkgver=0.39.0
 pkgrel=1
 pkgdesc="Content management system (web-CMS) server written in Erlang"
 arch=('any')
@@ -10,6 +10,7 @@ url="http://zotonic.com/"
 license=("Apache")
 depends=('erlang-nox'
          'postgresql'
+         'git'
          'imagemagick')
 optdepends=('perl-image-exiftool: Enable image autorotation'
             'nginx: Proxy Zotonic with nginx'
@@ -22,14 +23,11 @@ source=("https://github.com/zotonic/zotonic/archive/${pkgver}.tar.gz"
 	"${pkgname}.service"
         "config"
         "erlang.config")
-md5sums=('2f3b6c7bb2f1608acbdb4e4a558d7c63'
-         'a6f0f70d2a2af5ff0d0cfaf1531f6ed0'
-         '7904af22bf674471c212bde82a2cdcb6'
-         '4f09c0c994f5a17844b8ed999d3e7e39')
-sha512sums=('ecc5a2bc0c19bce98707960303ddd34aabd9f35fbf720b51ec31558b6debd7ee9ccb5332190d40c73d2a7866ee82914c96acc4d6ad677619b1e55da275686a43'
+
+sha512sums=('11e14fd088b988dc81bdb237058537cfb9bdeeb6c4ab8b7b142bf80a86f47688a149169981224ea8d1af906add54332d59f253cfaf74e6aee244418034cf7902'
             '0768bbbf07a3448429ae06e30a13751fc8060b3a7c626623731931d962664f542f13c93967b35303e3f0d8afdf848b4b83d310879d6deb1a7303cdc04f909953'
-            '62213581acaadcefacf15253175e27135bcc964768a061624a04ebcb3dc6e761ce3629017ce01286b741884fb0b23c4ebfcb6508f14200d99ecdb4f4860bd000'
-            'a6e5069e087a314053dab3774ecb123b5d5888c561430ecf02be34b72b3917c513d076323667188fde0ee6c2014e44f41b3a0a4b8fd79dd17c5523425f6979d8')
+            '73aa92b9666ac8bcc0b8988355eede2294da272825166cf4a493f52d158caa4b0a2b6c5cc7890f19702e9fec084e78287f7bdb6764602b2f033e85ffa2efeead'
+            '33e6402e7e2f4926249eac5b7c199985b620916907168408c752bcd659640bd3e61cdb4d75382ee22376ccf079d235acd678c00a7f9084be7bc7c536e943d0c5')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"  
diff --git a/config b/config
index f9b7170d9ecc..60fa276301de 100644
--- a/config
+++ b/config
@@ -1,96 +1,168 @@
-%% This is a sample config file for Zotonic.
+%% -*- mode: erlang -*-
+%% This is the global config file for Zotonic.
 %%
 %% The configurations are for the Zotonic system itself.
 %% Site configuration is found in each site's config file.
 %% The site config files are in the subdirectories of priv/sites/.
 %%
 %% To use this configuration file:
-%% 1. Make sure Zotonic is NOT running
-%% 2. Copy this file to "config" (in this "priv" directory)
-%% 3. Change (and uncomment) any setting you want to modify
-%% 4. Start Zotonic.
-%% 5. Check if Zotonic is using your new settings.
-%%    - When not then you have made a configuration error, start Zotonic
-%%      in debug mode with "./start.sh" or "zotonic.sh debug" 
-%%
-%%
-%% Zotonic will rewrite the file when settings are changed by Zotonic.
-%% Zotonic will ensure that there is a 'password' entry, adding it when necessary.
+%% 0. Do NOT modify 'config.in', but change the file called 'config',
+%%    which is a copy of config.in.
+%% 1. Stop Zotonic
+%% 2. Change (and uncomment) any setting you want to modify, in the file 'config'
+%% 3. Start Zotonic again.
 %%
 %% Rarely used configurations are commented out, change at your own risk.
 %% The given values are the defaults for the options.
 %%
 %% Be careful with the comma after each option, exclude it after the last option.
+[{zotonic,
+  [
+
+%%% Path configuration
+
+   %% Where the Zotonic sites are located
+   {user_sites_dir, "%%USER_SITES_DIR%%"},
+
+   %% Where the extra Zotonic modules are located (those installed with 'zotonic modules install mod_...')
+   {user_modules_dir, "%%USER_MODULES_DIR%%"},
+
+   %% Optionally define the ebin directory of the user sites and modules. Default
+   %% location is zotonic's ebin director.
+   % {user_ebin_dir, "%%USER_EBIN_DIR%%"},
+
+%%% Default timezone (for example: <<"Europe/Berlin">>)
+   %% {timezone, <<"UTC">>},
+
+%%% PostgreSQL database defaults.
+%%% These are the defaults for the equally named options in your site's config file.
+   {dbdatabase, "zotonic"},
+   {dbschema, "public"},
+   {dbpassword, []},
+   {dbuser, "zotonic"},
+   {dbport, 5432},
+   {dbhost, "localhost"},
+
+%%% By default, Zotonic will create a postgres database for you if it doesn't
+%%% already exist, and install tables in it. Uncomment the options below
+%%% to prevent that.
+ % {dbcreate, false},
+ % {dbinstall, false},
+
+%%% IP address on which Zotonic will listen for HTTP requests.
+%%% Always overridden by the ZOTONIC_IP environment variable.
+%%% Use 'any' for all IP addresses.
+   {listen_ip, any},
+
+%%% Port on which Zotonic will listen for HTTP requests.
+%%% Always overridden by the ZOTONIC_PORT environment variable.
+   {listen_port, 8000},
+
+%%% Outside port on which Zotonic will listen for HTTP requests.
+%%% Default set to listen_port.
+%%%   {port, 80},
+
+%%% Outside port zotonic uses to receive incoming HTTPS requests.
+%%% Default set to ssl_listen_port.
+%%%   {ssl_port, 443},
+
+%%% Inside listen port zotonic uses to receive HTTPS requests.
+%%% Always overridden by the ZOTONIC_SSL_PORT environment variable.
+%%%   {ssl_listen_port, 8443},
+
+%%% SMTP outbound relay configuration.
+   %% {smtp_relay, true},
+   %% {smtp_host, "localhost"},
+   %% {smtp_port, 2525},
+   %% {smtp_ssl, true},
+
+%%% SMTP extra relay options:
+%%% some picky/buggy/misconfigured relays might need one of these to be enabled.
+   %% {smtp_no_mx_lookups, false},
+   %% {smtp_verp_as_from, false},
+   %% {smtp_bounce_email_override, "me@example.com"},
+
+%%% SMTP mail queue.
+%%% How long to keep sent messages in the mail queue (in minutes).
+%%% Leave it long enough to receive any bounce message.
+   %% {smtp_delete_sent_after, 240},
+
+%%% SMTP debug options.
+%%% Send a copy of outgoing mail to this address:
+   %% {smtp_bcc, "bcc@localhost"},
+%%% Send all mail to this address instead of the original recipient:
+   %% {email_override, "override@localhost"},
+
+%%% SMTP Inbound Server Options.
+%%% Always overridden by the environment variables:
+%%% ZOTONIC_SMTP_LISTEN_DOMAIN, ZOTONIC_SMTP_LISTEN_IP and ZOTONIC_SMTP_LISTEN_PORT.
+   %% {smtp_listen_domain, undefined},
+   %% {smtp_listen_ip, "127.0.0.1"},
+   %% {smtp_listen_port, 2525},
+
+%%% SMTP Spamassassin options
+%%% Enable SMTP incoming message filtering by setting the listening address of spamd
+   %% {smtp_spamd_ip, {127,0,0,1}},
+   %% {smtp_spamd_port, 783},
+
+%%% SMTP DNSBL Realtime DNS Block Lists and White Lists
+%%% These services are checked for DNSBL listings upon receiving email, set to an
+%%% empty list to disable the DNSBL checks. The default list is defined in
+%%% deps/z_stdlib/src/z_email_dnsbl.erl
+   %% {smtp_dnsbl, ["zen.spamhaus.org", "dnsbl.sorbs.net"]},
+   %% {smtp_dnswl, ["list.dnswl.org", "swl.spamhaus.org"]},
+
+%%% Password for the sites administration site (zotonic_status). Will
+%%% be generated on first Zotonic startup, if the config file does not yet exist.
+   {password, "%%GENERATED%%"}
+
+%%% IP whitelist, used for accessing sites with a default "admin" password
+   %% {ip_whitelist, "127.0.0.0/8,10.0.0.0/8,192.168.0.0/16,172.16.0.0/12,169.254.0.0/16,::1,fd00::/8,fe80::/10"},
+
+%%% Inet request backlog, increase when requests are being dropped.
+   %% {inet_backlog, 500},
+
+%%% Inet acceptor pool size. Configure the number of processes waiting for incoming requests. Increase when
+%%% request take long to be accepted and you hit the backlog.
+   %% {inet_acceptor_pool_size, 75},
+
+%%% SSL request backlog, increase when requests are being dropped.
+%%% When this value is not set, the inet_backlog setting is used.
+   %% {ssl_backlog, 500},
+
+%%% SSL acceptor pool size. Configure the number of processes waiting for incoming ssl requests. Increase when
+%%% request take long to be accepted and you hit the backlog. Note that the ssl acceptor pool is bigger. The
+%%% reason for this is that accepting ssl requests is much slower than normal request. Especially if you have
+%%% slow clients.
+%%% When this value is not set, the inet_acceptor_pool_size setting is used.
+   %% {ssl_acceptor_pool_size, 75},
+
+%%% Default ImageMagick color space. Some ImageMagick versions (like 6.7.0 and above)
+%%% use the RGB colorspace, so all images are darker than the original.
+%%% Possible Values:
+%%% CMY, CMYK, Grey, HCL, HSB, HSL, HWB, Lab, LCH, LMS, Log, Luv, OHTA,
+%%% Rec601Luma, Rec601YCbCr, Rec709Luma, Rec709YCbCr, RGB, sRGB, Transparent,
+%%% XYZ, YCbCr, YCC, YIQ, YCbCr, YUV.
+   %% {default_colorspace, "sRGB"},
+
+%%% Whether or not to do a modification check on the templates while
+%%% they are rendered. Turn this off in production to increase
+%%% performance. However, you need to do an explicit z:flush() to see template changes.
+   %% {template_modified_check, true},
+
+%%% Automatically compile and load changed files. You must have inotify or fswatch installed.
+   %% {filewatcher_enabled, true},
+
+%%% Scan for changed files beam files if inotify and fswatch are not enabled
+%%% Enabling this will make the system slow, it is not advised on production systems.
+   %% {filewatcher_scanner_enabled, false},
+
+%%% List with extra dependencies which get fetched and compiled by rebar
+   %% {deps,
+   %%  [
+   %%   {jsx, "1.4", {git, "git://github.com/talentdeficit/jsx", {tag, "v1.4"}}}
+   %%  ]},
 
-[
-
- %% PostgeSQL database defaults.
- %% These are the defaults for the equally named options in your site's config file.
- {dbschema,"public"},
- {dbpassword,[]},
- {dbuser,"zotonic"},
- {dbport,5432},
- {dbhost,"localhost"},
-
- %% IP address Zotonic will listen on for HTTP requests
- %% Always overruled by the environment variable ZOTONIC_IP
- %% Use 'any' for all IP addresses
- {listen_ip,any},
- 
- %% Port Zotonic will listen on for HTTP requests.
- %% Always overruled by the environment variable ZOTONIC_PORT
- {listen_port,8000},
-
- %% SMTP outbound relay configuration
- % {smtp_relay, true},
- % {smtp_host, "localhost"},
- % {smtp_port, 2525},
- % {smtp_ssl, true},
-
- %% SMTP extra relay options:
- %% some picky/buggy/misconfigured relays might need one of these to be enabled
- % {smtp_no_mx_lookups, false},
- % {smtp_verp_as_from, false},
- % {smtp_bounce_email_override, "me@example.com"},
-
- %% SMTP mail queue
- %% How long to keep sent messages in the mail queue (in minutes)
- %% Leave it long enough to receive any bounce message
- % {smtp_delete_sent_after, 240},
-
- %% SMTP debug options
- %% Send a copy of outgoing mail to this address
- % {smtp_bcc, "bcc@localhost"},
- %% Send all mail to this address instead of the original recipient
- % {email_override, "override@localhost"},
-
- %% SMTP Inbound Server Options 
- %% Always overruled by the environment variables ZOTONIC_SMTP_LISTEN_DOMAIN, ZOTONIC_SMTP_LISTEN_IP and ZOTONIC_SMTP_LISTEN_PORT
- % {smtp_listen_domain, undefined},
- % {smtp_listen_ip, "127.0.0.1"},
- % {smtp_listen_port, 2525},
-
- %% Password for the sites administration site (zotonic_status)
- %% Zotonic will generate a secure password for you, so you don't need to enable this.  
- %% When you enable this you MUST select a secure password!!!
- % {password, ""},
- 
- %% inet request backlog, enlarge when requests are dropped
- % {inet_backlog,500},
- 
- %% Directory where log files are written
- % {log_dir,"priv/log"},
- {log_dir,"/var/log/zotonic"},
-
- %% Enable performance logging (in addition to request logging)
- % {enable_perf_logger, true},
-
- %% Webmachine error handler, you can use your own.
- % {webmachine_error_handler,z_webmachine_error_handler},
-
- %% Default ImageMagick color space. Some ImageMagick versions (like 6.7.0 and above) use the RGB colorspace, so all images are darker then the original. <br />Possible Values: CMY, CMYK, Grey, HCL, HSB, HSL, HWB, Lab, LCH, LMS, Log, Luv, OHTA, Rec601Luma, Rec601YCbCr, Rec709Luma, Rec709YCbCr, RGB, sRGB, Transparent, XYZ, YCbCr, YCC, YIQ, YCbCr, YUV
- % {default_colorspace, "sRGB"},
-
- % Date this file was created/updated
- {modify_date, {{2010,7,12},{12,28,30}}}
+  ]
+ }
 ].
diff --git a/erlang.config b/erlang.config
index 73a0fcd8add7..82fb92648b4a 100644
--- a/erlang.config
+++ b/erlang.config
@@ -1,17 +1,80 @@
 %% -*- mode: erlang -*-
-[{lager,
+[
+
+ {exometer, [{predefined, [
+    {[erlang, memory], {function, erlang, memory, [], value, []}, []},
+    {[erlang, system_info], {function, erlang, system_info, ['$dp'], value, [process_count]}, []},
+    {[erlang, statistics], {function, erlang, statistics, ['$dp'], value, [run_queue]}, []},
+    {[erlang, io], {function, erlang, statistics, [io], match, {{'_', input}, {'_', output}}}, []}
+   ]}
+ ]},
+
+ {mnesia, [
+    {dir, "priv/mnesia"}
+ ]},
+
+ {emqtt, [
+    {auth, {zotonic, []}},
+    {access_control, {zotonic, []}},
+    {listeners, [
+        %%% Unescape to enable MQTT on the given port
+        % {1883,  [
+        %     binary,
+        %     {packet,        raw},
+        %     {reuseaddr,     true},
+        %     {backlog,       128},
+        %     {nodelay,       true}
+        % ]}
+    ]}
+ ]},
+
+ {lager,
   [{handlers,
-    [{lager_console_backend, info},
-     {lager_file_backend,
-      [{"/var/log/zotonic/error.log", error, 10485760, "$D0", 5},
-       {"/var/log/zotonic/console.log", info, 10485760, "$D0", 5}
-      ]}
+    [
+      {lager_console_backend, [info, {lager_default_formatter, [time, color, " [", severity, "] ", {site, [site, " "], ""}, {module, [module, ":", line, " "], ""}, message, "\n"]}]},
+      {lager_file_backend, [{file, "priv/log/error.log"}, {level, error}, {formatter_config, [date, " ", time, " [", severity, "] ", {site, [site, " "], ""}, {pid, ""}, {module, [{pid, ["@"], ""}, module, {function, [":", function], ""}, {line, [":", line], ""}], ""}, " ", message, "\n"] }]},
+      {lager_file_backend, [{file, "priv/log/console.log"}, {level, info}, {formatter_config, [date, " ", time, " [", severity, "] ", {site, [site, " "], ""}, {pid, ""}, {module, [{pid, ["@"], ""}, module, {function, [":", function], ""}, {line, [":", line], ""}], ""}, " ", message, "\n"] }]}
     ]},
-   {crash_log, "/var/log/zotonic/crash.log"}
+   {crash_log, "priv/log/crash.log"}
   ]},
 
  {webzmachine,
-  [{wmtrace_dir, "priv/wmtrace"},
-   {silent_console, true}
+  [
+%%% Logger module, use this option to set your own.
+   %% {webmachine_logger_module, z_stats}, % <- default set by Zotonic
+   %% {webmachine_logger_module, webmachine_logger}, % <- webmachine default
+
+%%% Error handler module, use this option to set your own.
+   %% {error_handler, z_webmachine_error_handler}, % <- default set by Zotonic
+   %% {error_handler, webmachine_error_handler}, % <- webmachine default
+
+%%% Set this option to false if you want webmachine to write info about
+%%% opening/closing log files to the Erlang console.
+   %% {silent_console, true},
+
+%%% Location of access logs (logging is disabled if not set).
+   {log_dir, "priv/log/access/"},
+
+%%% Location of performance logs (logging is disabled if not set).
+   %% {perf_log_dir, "priv/log/perf/"},
+
+%%% Location of wmtrace logs (defaults to "priv/wmtrace" if not specified).
+   {wmtrace_dir, "priv/log/wmtrace/"},
+
+%%% Which sendfile command to use: disable, yaws, erlang;
+%%% disabled by default because both erlang and yaws implementations are buggy
+   {use_sendfile, disable}
+
+  ]},
+
+    {filezcache, [
+        {data_dir, "priv/filezcache/data"},
+        {journal_dir, "priv/filezcache/journal"}
+    ]},
+
+ {setup,
+  [
+   {data_dir, "priv/data"},
+   {log_dir,  "priv/log"}
   ]}
 ].
diff --git a/zotonic.install b/zotonic.install
index 792c4ebdc313..9734369f2332 100644
--- a/zotonic.install
+++ b/zotonic.install
@@ -19,6 +19,10 @@ post_install() {
   echo "# first run, as it will generate the      #"
   echo "# Erlang byte-code from source.           #"
   echo "###########################################"
+  echo "# Admin page:                             #"
+  echo "# http://127.0.0.1:8000                   #"
+  echo "# https://127.0.0.1:8443                  #"
+  echo "###########################################"
 }
 
 post_remove() {