diff options
| author | Nils Gillmann <ng0@n0.is> | 2018-09-25 20:06:00 +0000 |
|---|---|---|
| committer | Nils Gillmann <ng0@n0.is> | 2018-09-25 20:06:00 +0000 |
| commit | 13881c4cdea5382a454f119a0a2413ff799441cb (patch) | |
| tree | 15c35b5431c8aa309b917e38bc8b8221f255c06b | |
| parent | d2617c6bb3b87c157e20a9df8ca6dfb8063756fe (diff) | |
| parent | 4220f729be2123e9c63aea507d7d7d54ab3a6903 (diff) | |
| download | deployment-13881c4cdea5382a454f119a0a2413ff799441cb.tar.gz deployment-13881c4cdea5382a454f119a0a2413ff799441cb.tar.bz2 deployment-13881c4cdea5382a454f119a0a2413ff799441cb.zip | |
Merge branch 'master' of git.taler.net:deployment
| -rwxr-xr-x | config/generate-config | 2 | ||||
| -rw-r--r-- | etc/nginx/sites-enabled/docs-ssl.site | 5 | ||||
| -rw-r--r-- | taler-arm/taler-exchange-wirewatch.conf | 2 | ||||
| -rwxr-xr-x | taler-docbuild/update_doc_landing.sh | 8 |
4 files changed, 14 insertions, 3 deletions
diff --git a/config/generate-config b/config/generate-config index aac440f..69a873f 100755 --- a/config/generate-config +++ b/config/generate-config @@ -53,7 +53,7 @@ def config(currency, envname, exchange_pub, standalone): cfg_put("bank", "uwsgi_unixpath", "$HOME/sockets/bank.uwsgi") cfg_put("bank", "uwsgi_unixpath_mode", "660") cfg_put("bank", "database", "taler"+envname) - cfg_put("bank", "max_debt", "%s:0.0" % currency) + cfg_put("bank", "max_debt", "%s:20.0" % currency) cfg_put("bank", "max_debt_bank", "%s:0.0" % currency) if standalone: cfg_put("bank", "database", "postgres:///taler?host={}/sockets".format(os.getenv("HOME"))) diff --git a/etc/nginx/sites-enabled/docs-ssl.site b/etc/nginx/sites-enabled/docs-ssl.site index 2e02a9c..923d703 100644 --- a/etc/nginx/sites-enabled/docs-ssl.site +++ b/etc/nginx/sites-enabled/docs-ssl.site @@ -16,8 +16,13 @@ server { autoindex off; ssi off; # ssi_last_modified on; + + + rewrite ^/$ /$index_redirect_uri/ redirect; + rewrite ^/(..)/$ /$1/index.html break; } + location /code/exchange { alias /home/docbuilder/build/exchange/doxygen; } diff --git a/taler-arm/taler-exchange-wirewatch.conf b/taler-arm/taler-exchange-wirewatch.conf index 45e8556..9595f88 100644 --- a/taler-arm/taler-exchange-wirewatch.conf +++ b/taler-arm/taler-exchange-wirewatch.conf @@ -1,4 +1,4 @@ [taler-exchange-wirewatch] TYPE = simple BINARY = taler-exchange-wirewatch -OPTIONS = -t test -L INFO -l $HOME/logs/wirewatch-%Y-%m-%d.log +OPTIONS = -L INFO -l $HOME/logs/wirewatch-%Y-%m-%d.log diff --git a/taler-docbuild/update_doc_landing.sh b/taler-docbuild/update_doc_landing.sh index bbc0086..f747fa2 100755 --- a/taler-docbuild/update_doc_landing.sh +++ b/taler-docbuild/update_doc_landing.sh @@ -14,6 +14,12 @@ cd $HOME/docs-landing/ fetch git submodule update --force --init +# Get the MOs files. +make compile + +# Get the translated final HTMLs. +make translate + # No compilation needed so far. mkdir -p $HOME/build/docs-landing/ -cp -t $HOME/build/docs-landing/ *.{html,css,svg} +cp -rt $HOME/build/docs-landing/ *.{css,svg} en/ fr/ it/ es/ pt/ ru/ de/ |