Merge branch 'installer-v2'
This commit is contained in:
commit
ac36a35c19
|
@ -23,7 +23,7 @@ Install Standalone
|
||||||
### curl | bash
|
### curl | bash
|
||||||
|
|
||||||
```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
|
### git
|
||||||
|
|
|
@ -26,7 +26,7 @@ Group=MY_GROUP
|
||||||
Environment=GOLDILOCKS_PATH=/srv/www NODE_PATH=/opt/goldilocks/lib/node_modules NPM_CONFIG_PREFIX=/opt/goldilocks
|
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
|
# 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
|
ExecStart=/opt/goldilocks/bin/node /opt/goldilocks/bin/goldilocks --config /etc/goldilocks/goldilocks.yml
|
||||||
ExecReload=/bin/kill -USR1 $MAINPID
|
ExecReload=/bin/kill -USR1 $MAINPID
|
||||||
|
|
||||||
|
|
|
@ -123,7 +123,8 @@ echo "User $my_user Group $my_group"
|
||||||
$sudo_cmd chown -R $my_user:$my_group $my_tmp/*
|
$sudo_cmd chown -R $my_user:$my_group $my_tmp/*
|
||||||
$sudo_cmd chown root:root $my_tmp/*
|
$sudo_cmd chown root:root $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
|
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
|
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
|
# 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
|
# the setuid and setgid bits so that any files/directories created inside these
|
||||||
# directories have the same owner and group.
|
# 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 {} \;
|
find $my_root/opt/$my_name -type d -exec $sudo_cmd chmod ug+s {} \;
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue