[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-deployment] branch master updated: playground nginx
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-deployment] branch master updated: playground nginx conf |
Date: |
Thu, 22 Feb 2018 17:36:36 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository deployment.
The following commit(s) were added to refs/heads/master by this push:
new 02856ec playground nginx conf
02856ec is described below
commit 02856ec1fa0794c36c6489704df8b13ff4dd5695
Author: Florian Dold <address@hidden>
AuthorDate: Thu Feb 22 17:36:29 2018 +0100
playground nginx conf
---
etc/nginx/sites-enabled/test.site | 34 ++++++++++++++++++++++++++++++++++
taler-build/update_libmicrohttpd.sh | 2 +-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/etc/nginx/sites-enabled/test.site
b/etc/nginx/sites-enabled/test.site
index b4689f2..c9f7b6f 100644
--- a/etc/nginx/sites-enabled/test.site
+++ b/etc/nginx/sites-enabled/test.site
@@ -170,6 +170,40 @@ server {
server {
+ server_name playground.test.taler.net;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ root /dev/null;
+ include conf.d/talerssl;
+
+ location @blue {
+ add_header X-Taler-Deployment-Color blue;
+ uwsgi_pass unix:/home/test-blue/sockets/playground.uwsgi;
+ include /etc/nginx/uwsgi_params;
+ }
+ location @green {
+ add_header X-Taler-Deployment-Color green;
+ uwsgi_pass unix:/home/test-green/sockets/playground.uwsgi;
+ include /etc/nginx/uwsgi_params;
+ }
+
+ location / {
+ # Redirection technique explainted at
+ # https://www.nginx.com/resources/wiki/start/topics/depth/ifisevil/
+ error_page 418 = @blue;
+ error_page 419 = @green;
+ recursive_error_pages on;
+ if ($http_x_taler_deployment_color ~ "blue") { return 418; }
+ if ($http_x_taler_deployment_color ~ "green") { return 419; }
+ uwsgi_pass unix:/home/test/sockets/playground.uwsgi;
+ include /etc/nginx/uwsgi_params;
+ }
+
+ include conf.d/favicon_robots;
+}
+
+
+server {
server_name backend.test.taler.net;
listen 443 ssl;
listen 80;
diff --git a/taler-build/update_libmicrohttpd.sh
b/taler-build/update_libmicrohttpd.sh
index 43aa639..56b8837 100755
--- a/taler-build/update_libmicrohttpd.sh
+++ b/taler-build/update_libmicrohttpd.sh
@@ -3,7 +3,7 @@
cd $HOME/libmicrohttpd/
git clean -fdx
-git fetch
+git fetch --all
# reset to updated upstream branch, but only if we're tracking a branch
branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
git reset --hard "$branch"
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-deployment] branch master updated: playground nginx conf,
gnunet <=