From 56725bca7244da0a34b0e2e149f9320e85e6221c Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Wed, 10 Feb 2016 14:07:32 -0500 Subject: [PATCH 1/2] Updated makefile Former-commit-id: f790c5b5971f93368795af12669efa98e251d504 [formerly 18fcb6447d4483d18eeab31a09d1f2af5b821819] [formerly 2774b502c293cc8c722f71e90915cc6413f14d14 [formerly 88a7bd4e1acb4d5accdb12de57abfb95976e1297 [formerly c8dbac7485b3e774b2734fd81952d1a9d1082d2e]]] Former-commit-id: 486053c152a201c69276786b47563ac2684b0cbb [formerly 15105c5550c5b4f35720a3c195ea7abe068ce856] Former-commit-id: ebea15f259bbc0e5bc3fe6584c206046860a561a Former-commit-id: d7bf986ddfbb3247757ce4101e305e5e3b24a892 --- Makefile | 5 ++--- install/awwkoala.init | 0 install/awwkoala.nginx | 0 3 files changed, 2 insertions(+), 3 deletions(-) mode change 100644 => 100755 install/awwkoala.init mode change 100644 => 100755 install/awwkoala.nginx diff --git a/Makefile b/Makefile index cb37c90..b66f152 100644 --- a/Makefile +++ b/Makefile @@ -19,10 +19,9 @@ install: sed -i 's^CUR_DIR^$(CUR_DIR)^g' jinstall/awwkoala.init sed -i 's^USERCUR^$(USERCUR)^g' jinstall/awwkoala.init sed -i 's^PORT^$(PORT)^g' jinstall/awwkoala.init - mv jinstall/awwkoala.init /etc/init.d/ + cp jinstall/awwkoala.init /etc/init.d/awwkoala.init chmod +x /etc/init.d/awwkoala.init - mv jinstall/awwkoala.nginx /etc/nginx/sites-available/awwkoala.nginx - rm /etc/nginx/sites-enabled/awwkoala.nginx + cp jinstall/awwkoala.nginx /etc/nginx/sites-available/awwkoala.nginx ln -fs /etc/nginx/sites-available/awwkoala.nginx /etc/nginx/sites-enabled/awwkoala.nginx /etc/init.d/nginx reload /etc/init.d/nginx restart diff --git a/install/awwkoala.init b/install/awwkoala.init old mode 100644 new mode 100755 diff --git a/install/awwkoala.nginx b/install/awwkoala.nginx old mode 100644 new mode 100755 From 47821b125104d24102c87ad4e029ea77d87a1d2a Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Wed, 10 Feb 2016 14:11:26 -0500 Subject: [PATCH 2/2] Updated Makefile Former-commit-id: 4748f694c5dfdca76f844d10cc8de07fe832ef1c [formerly c0fc8491379c96efaad4c510ba53ba573b2b17d4] [formerly 902748fbcbf673d7fce1c1449365d3b0b2fc90c6 [formerly 1d736dbebfe083fcdafb9a9e921269767a66ae2d [formerly 8142635dd27119fc7d91154011701ed5220ed90b]]] Former-commit-id: 2ed6596ad41330de8e40cd978c4087ca99481fda [formerly 9bbac225895af026f1defec7861260ab51af100e] Former-commit-id: 63b0895880156600b813001c6d11ce0108739bea Former-commit-id: bb57d1ed67f5e775f22de77c551efb7af7e1d6bb --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b66f152..79a606d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ADDRESS = awwkoala.com -PORT = 8002 +PORT = 8003 CUR_DIR = $(shell bash -c 'pwd') USERCUR = $(shell bash -c 'whoami')