From 7616decdf9ea2c4281aabdee6200f0567261f0eb Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Thu, 15 Dec 2016 07:53:18 +0200 Subject: [PATCH 1/6] remove extra debug messages --- src/post-receive.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/post-receive.php b/src/post-receive.php index 523209f..2178a29 100644 --- a/src/post-receive.php +++ b/src/post-receive.php @@ -5,9 +5,6 @@ $command = "cd /var/www/status-site && git reset --hard HEAD && git pull origin // TODO check against ip or secret hash $log_file = "/var/www/status-site/build.log"; -file_put_contents($log_file, var_export($_SERVER, true), FILE_APPEND); -$content = file_get_contents("php://input"); -file_put_contents($log_file, var_export($content, true), FILE_APPEND); if ( $_SERVER['HTTP_X_GITHUB_EVENT'] == 'push' ) { if( ($fp = popen($command, "r")) ) { From 0e94d4d5204001a351498c37d080a30747a103d9 Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Thu, 15 Dec 2016 08:20:06 +0200 Subject: [PATCH 2/6] test deploy --- src/post-receive.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/post-receive.php b/src/post-receive.php index 2178a29..a9c05c2 100644 --- a/src/post-receive.php +++ b/src/post-receive.php @@ -1,7 +1,7 @@ &1"; // TODO check against ip or secret hash $log_file = "/var/www/status-site/build.log"; @@ -11,8 +11,8 @@ if ( $_SERVER['HTTP_X_GITHUB_EVENT'] == 'push' ) { while( !feof($fp) ){ $result = fread($fp, 1024); file_put_contents($log_file, $result, FILE_APPEND); - echo $result; - flush(); + //echo $result; + //flush(); } fclose($fp); } From 5c22ac61e825b3e00bcd2654e63dddf7e14339d7 Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Thu, 15 Dec 2016 08:24:11 +0200 Subject: [PATCH 3/6] test deploy --- src/post-receive.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/post-receive.php b/src/post-receive.php index a9c05c2..ec2e04a 100644 --- a/src/post-receive.php +++ b/src/post-receive.php @@ -8,12 +8,12 @@ $log_file = "/var/www/status-site/build.log"; if ( $_SERVER['HTTP_X_GITHUB_EVENT'] == 'push' ) { if( ($fp = popen($command, "r")) ) { - while( !feof($fp) ){ - $result = fread($fp, 1024); - file_put_contents($log_file, $result, FILE_APPEND); + //while( !feof($fp) ){ + // $result = fread($fp, 1024); + file_put_contents($log_file, $fp, FILE_APPEND); //echo $result; //flush(); - } + //} fclose($fp); } } From 1c741273c423dfbfd88468c036df3e594e979e2d Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Thu, 15 Dec 2016 10:28:14 +0200 Subject: [PATCH 4/6] fix npm install exec --- src/post-receive.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/post-receive.php b/src/post-receive.php index ec2e04a..45d7d19 100644 --- a/src/post-receive.php +++ b/src/post-receive.php @@ -1,19 +1,9 @@ &1"; // TODO check against ip or secret hash -$log_file = "/var/www/status-site/build.log"; if ( $_SERVER['HTTP_X_GITHUB_EVENT'] == 'push' ) { - - if( ($fp = popen($command, "r")) ) { - //while( !feof($fp) ){ - // $result = fread($fp, 1024); - file_put_contents($log_file, $fp, FILE_APPEND); - //echo $result; - //flush(); - //} - fclose($fp); - } + shell_exec("sudo /var/www/status-site/deploy.sh"); + echo file_get_contents("/var/www/status-site/build.log"); } From a4bb6e34377162bcffcabf8ec8193cb8a02b876b Mon Sep 17 00:00:00 2001 From: Carl Date: Thu, 15 Dec 2016 23:25:23 +1300 Subject: [PATCH 5/6] added adwords tracking pixel removed unused welcome.html page, and added adwords pixel to success.html --- src/success.html | 28 +- src/welcome.html | 663 ----------------------------------------------- 2 files changed, 24 insertions(+), 667 deletions(-) delete mode 100644 src/welcome.html diff --git a/src/success.html b/src/success.html index f7c6c4d..3cc5c5f 100644 --- a/src/success.html +++ b/src/success.html @@ -4,7 +4,7 @@ - Status | The Mobile Ethereum Client + Waitlist Confirmation | Status, The Mobile Ethereum Client @@ -55,9 +55,9 @@
-

You’ve been added to the Waitlist. Could you help us spread the word?

+

You’ve been added to the Waitlist.
Could you help us spread the word?

-

Please help support our open source project with a tweet, or follow us to stay updated on our progress

+

Please help support our open source project with a tweet, or follow us to stay updated on our progress:

@@ -70,7 +70,6 @@
-
- - - -
-
-
-
- -

Status Holdings Pte. Ltd. -
6 Ubi Road - Singapore -
support@status.im

-
- - - -
-
-
- -
- Slack - Jobs - - Github -
-
-
-
-
- - - - - - - - - - - - - - - - From 0d0cc32bd7c6a54fc536cb5f7a5f7365cbdd4249 Mon Sep 17 00:00:00 2001 From: Carl Date: Thu, 15 Dec 2016 23:44:51 +1300 Subject: [PATCH 6/6] added slack link to success page --- src/success.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/success.html b/src/success.html index 3cc5c5f..5da7987 100644 --- a/src/success.html +++ b/src/success.html @@ -66,7 +66,7 @@
- Learn more about Status + Learn more about Status