From a7eff72b431be86011b2de0fd0a8c580d597f88f Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Mon, 8 Feb 2016 12:15:29 -0500 Subject: [PATCH] Added makefile Former-commit-id: fcedfb6154c9bc2a80a90e027bbc69f02d755e2c [formerly 5adb4a7a303116dc002814c408a798dc86512a90] [formerly 866edb50ab438dd4123edf0761ff8445b5a84dc7 [formerly 8aa6928270d0d924753017270b4733c90ff1a01b [formerly a4680105f8a5d504c985c548b3af811d581de7f6]]] Former-commit-id: 58a32e4ecb0d2131b51074b01acbbd4318a0c347 [formerly da121f68ff68d214c7bc98d5d29fc6c40ca3c6e9] Former-commit-id: 241fce62599a0f0d0fbf3f2ad036d481dd1897be Former-commit-id: 992e0fe7768066ddc2ec16cbe3ce2b0118cb5ed3 --- Makefile | 29 +++++++++++++++++++++++------ install/cowyo.init | 4 ++-- install/cowyo.nginx | 2 +- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 4cd7a18..567124c 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,26 @@ +ADDRESS = cowyo.com +PORT = 8001 + CUR_DIR = $(shell bash -c 'pwd') -CUR_USER = $(shell bash -c 'echo $USER') -PORT ?= $(shell bash -c 'read -p "Port (e.g. 8001): " pwd; echo $$pwd') -EXTERNAL_ADDRESS ?= $(shell bash -c 'read -p "External address (e.g. something.com): " pwd; echo $$pwd') +USERCUR = $(shell bash -c 'whoami') all: - echo The password is $(EXTERNAL_ADDRESS) - echo The port is $(PORT) - echo The cwd is $(CUR_DIR) + rm -rf jinstall + mkdir jinstall + cp install/cowyo.nginx jinstall/cowyo.nginx + sed -i 's/PORT/$(PORT)/g' jinstall/cowyo.nginx + sed -i 's/ADDRESS/$(ADDRESS)/g' jinstall/cowyo.nginx + sed -i 's^CUR_DIR^$(CUR_DIR)^g' jinstall/cowyo.nginx + cp install/cowyo.init jinstall/cowyo.init + sed -i 's/EXT_ADDRESS/$(ADDRESS)/g' jinstall/cowyo.init + sed -i 's^CUR_DIR^$(CUR_DIR)^g' jinstall/cowyo.init + sed -i 's^USERCUR^$(USERCUR)^g' jinstall/cowyo.init + mv jinstall/cowyo.init /etc/init.d/ + chmod +x /etc/init.d/cowyo.init + mv jinstall/cowyo.nginx /etc/nginx/sites-available/cowyo.nginx + rm /etc/nginx/sites-enabled/cowyo.nginx + ln -s /etc/nginx-sites-available/cowyo.nginx /etc/nginx/sites-enabled/cowyo.nginx + /etc/init.d/nginx reload + /etc/init.d/nginx restart + /etc/init.d/cowyo.init start + rm -rf jinstall diff --git a/install/cowyo.init b/install/cowyo.init index 75dca02..452d151 100644 --- a/install/cowyo.init +++ b/install/cowyo.init @@ -5,8 +5,8 @@ # sudo /etc/init.d/cowyo start dir="CUR_DIR" -user="USER" -cmd="./cowyo EXTERNAL_ADDRESS" +user="USERCUR" +cmd="./cowyo EXT_ADDRESS" name="cowyo" pid_file="/var/run/$name.pid" diff --git a/install/cowyo.nginx b/install/cowyo.nginx index 0947ac6..c6f14b6 100644 --- a/install/cowyo.nginx +++ b/install/cowyo.nginx @@ -5,7 +5,7 @@ server { access_log /etc/nginx/logs/access-cowyo.log; error_log /etc/nginx/logs/error-cowyo.log info; root CUR_DIR; - server_name EXTERNAL_ADDRESS; + server_name ADDRESS; # Media: images, icons, video, audio, HTC location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ {