From 200a6cc96037786b7b12ab0dbdb1143ed680891b Mon Sep 17 00:00:00 2001 From: titoko titoko Date: Fri, 29 Nov 2013 18:27:42 +0100 Subject: [PATCH 01/11] remove / --- scripts/install | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/install b/scripts/install index 6418625..20ffbb9 100644 --- a/scripts/install +++ b/scripts/install @@ -10,6 +10,9 @@ if [[ ! $? -eq 0 ]]; then exit 1 fi +# Remove trailing "/" for next commands +path=${path%/} + # Generate random DES key & password deskey=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') From 6dfcb200e03486e5edbc137026785a6578e9250a Mon Sep 17 00:00:00 2001 From: titoko Date: Fri, 29 Nov 2013 18:52:56 +0100 Subject: [PATCH 02/11] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index ba7717a..79c5fb2 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location PATHTOCHANGE { +location PATHTOCHANGE/ { alias ALIASTOCHANGE ; if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; From eccdc051551594149e709ef0463e74d511dd4d0c Mon Sep 17 00:00:00 2001 From: titoko titoko Date: Fri, 29 Nov 2013 19:16:41 +0100 Subject: [PATCH 03/11] testurl --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index 20ffbb9..157ecb2 100644 --- a/scripts/install +++ b/scripts/install @@ -11,7 +11,9 @@ exit 1 fi # Remove trailing "/" for next commands +if [ ! $path -lt 2 ]; then path=${path%/} +fi # Generate random DES key & password deskey=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') From e03b21203e67c64537b0d2cf131b6f86b5bb4225 Mon Sep 17 00:00:00 2001 From: titoko Date: Fri, 29 Nov 2013 19:24:50 +0100 Subject: [PATCH 04/11] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 157ecb2..095025b 100644 --- a/scripts/install +++ b/scripts/install @@ -11,7 +11,7 @@ exit 1 fi # Remove trailing "/" for next commands -if [ ! $path -lt 2 ]; then +if [ !$path = "/" ]; then path=${path%/} fi From c23d9d8d8a2f863d51a57e882fb1f4b3ff511fd0 Mon Sep 17 00:00:00 2001 From: titoko Date: Fri, 29 Nov 2013 19:28:26 +0100 Subject: [PATCH 05/11] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 095025b..227b349 100644 --- a/scripts/install +++ b/scripts/install @@ -11,7 +11,7 @@ exit 1 fi # Remove trailing "/" for next commands -if [ !$path = "/" ]; then +if [ $path != "/" ]; then path=${path%/} fi From 972c87364aeaa65db97c0c9c62ce9ca5cb0b0e31 Mon Sep 17 00:00:00 2001 From: titoko Date: Fri, 29 Nov 2013 19:46:24 +0100 Subject: [PATCH 06/11] Update install --- scripts/install | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/install b/scripts/install index 227b349..79c1be3 100644 --- a/scripts/install +++ b/scripts/install @@ -10,10 +10,6 @@ if [[ ! $? -eq 0 ]]; then exit 1 fi -# Remove trailing "/" for next commands -if [ $path != "/" ]; then -path=${path%/} -fi # Generate random DES key & password deskey=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') From 47cd0867588da90be4b7dec041ac54bc8ba03db2 Mon Sep 17 00:00:00 2001 From: titoko Date: Fri, 29 Nov 2013 19:49:58 +0100 Subject: [PATCH 07/11] Update install --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index 79c1be3..20ffbb9 100644 --- a/scripts/install +++ b/scripts/install @@ -10,6 +10,8 @@ if [[ ! $? -eq 0 ]]; then exit 1 fi +# Remove trailing "/" for next commands +path=${path%/} # Generate random DES key & password deskey=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') From 17c91fc0037f3092b4859dfaebc3b1bc93e36ae1 Mon Sep 17 00:00:00 2001 From: titoko Date: Fri, 29 Nov 2013 19:58:20 +0100 Subject: [PATCH 08/11] Update install --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index 20ffbb9..74fb029 100644 --- a/scripts/install +++ b/scripts/install @@ -11,7 +11,9 @@ exit 1 fi # Remove trailing "/" for next commands +if [ "$path" != "/" ]; then path=${path%/} +fi # Generate random DES key & password deskey=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') From b0ee44fde04acd1617dbec392e4c758c10b12951 Mon Sep 17 00:00:00 2001 From: titoko Date: Fri, 29 Nov 2013 20:02:46 +0100 Subject: [PATCH 09/11] Update install --- scripts/install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 74fb029..febf1af 100644 --- a/scripts/install +++ b/scripts/install @@ -11,9 +11,8 @@ exit 1 fi # Remove trailing "/" for next commands -if [ "$path" != "/" ]; then path=${path%/} -fi + # Generate random DES key & password deskey=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') From 25d0b2dff5f2367e5ffdbbb768102e555917cf90 Mon Sep 17 00:00:00 2001 From: titoko Date: Fri, 29 Nov 2013 20:08:13 +0100 Subject: [PATCH 10/11] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index febf1af..04866c4 100644 --- a/scripts/install +++ b/scripts/install @@ -11,7 +11,7 @@ exit 1 fi # Remove trailing "/" for next commands -path=${path%/} +#path=${path%/} # Generate random DES key & password From 76e5f4e75273cea9e30aa197067610ca21e72d15 Mon Sep 17 00:00:00 2001 From: titoko Date: Fri, 29 Nov 2013 20:25:13 +0100 Subject: [PATCH 11/11] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 04866c4..febf1af 100644 --- a/scripts/install +++ b/scripts/install @@ -11,7 +11,7 @@ exit 1 fi # Remove trailing "/" for next commands -#path=${path%/} +path=${path%/} # Generate random DES key & password