From 8ee24fcd77146fdd72f60054a567e9fcc96f9a22 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 7 Nov 2017 14:30:07 -0700 Subject: [PATCH 1/3] curl | bash --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c34d3c6..c9b9167 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Install Standalone ### curl | bash ```bash -curl -fsSL https://git.daplie.com/Daplie/goldilocks.js/raw/v1.1/installer/get.sh +curl -fsSL https://git.daplie.com/Daplie/goldilocks.js/raw/v1.1/installer/get.sh | bash ``` ### git From 6ae1e463c9c4c9a27359e056c61cff76620cde40 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 7 Nov 2017 14:59:31 -0700 Subject: [PATCH 2/3] don't change existing files and folders --- installer/install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/installer/install.sh b/installer/install.sh index df9fb3d..7c425c4 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -123,7 +123,8 @@ echo "User $my_user Group $my_group" $sudo_cmd chown -R $my_user:$my_group $my_tmp/* $sudo_cmd chown root:root $my_tmp/* $sudo_cmd chown root:root $my_tmp -rsync -a $my_tmp/ $my_root/ +# don't change permissions on /, /etc, etc +rsync -a --ignore-existing $my_tmp/ $my_root/ rsync -a --ignore-existing $my_app_dist/etc/$my_name/$my_name.yml $my_root/etc/$my_name/$my_name.yml source ./installer/install-system-service.sh @@ -134,7 +135,7 @@ $sudo_cmd chown -R $my_user:$my_group $my_root/var/www $my_root/srv/www # make sure the files are all read/write for the owner and group, and then set # the setuid and setgid bits so that any files/directories created inside these # directories have the same owner and group. -$sudo_cmd chmod -R ug+rwX /opt/$my_name +$sudo_cmd chmod -R ug+rwX $my_root/opt/$my_name find $my_root/opt/$my_name -type d -exec $sudo_cmd chmod ug+s {} \; From a2d81e4302de1c0bee3fcf26855001ec5f4b07df Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 7 Nov 2017 15:02:49 -0700 Subject: [PATCH 3/3] use home folder --- dist/etc/systemd/system/goldilocks.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/etc/systemd/system/goldilocks.service b/dist/etc/systemd/system/goldilocks.service index ac0992c..2e97bce 100644 --- a/dist/etc/systemd/system/goldilocks.service +++ b/dist/etc/systemd/system/goldilocks.service @@ -26,7 +26,7 @@ Group=MY_GROUP Environment=GOLDILOCKS_PATH=/srv/www NODE_PATH=/opt/goldilocks/lib/node_modules NPM_CONFIG_PREFIX=/opt/goldilocks # Set a sane working directory, sane flags, and specify how to reload the config file -WorkingDirectory=/srv/www +WorkingDirectory=/opt/goldilocks ExecStart=/opt/goldilocks/bin/node /opt/goldilocks/bin/goldilocks --config /etc/goldilocks/goldilocks.yml ExecReload=/bin/kill -USR1 $MAINPID