use correct paths

This commit is contained in:
AJ ONeal 2017-11-07 05:06:59 -07:00
parent aea6853822
commit 51c5976f11
2 changed files with 5 additions and 3 deletions

View File

@ -26,7 +26,7 @@ Group=MY_GROUP
; Environment=GOLDILOCKS_PATH=/opt/walnut ; Environment=GOLDILOCKS_PATH=/opt/walnut
# 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/walnut
ExecStart=/opt/walnut/bin/node /opt/walnut/core/bin/walnut.js --config=/etc/walnut/walnut.yml ExecStart=/opt/walnut/bin/node /opt/walnut/core/bin/walnut.js --config=/etc/walnut/walnut.yml
ExecReload=/bin/kill -USR1 $MAINPID ExecReload=/bin/kill -USR1 $MAINPID
@ -46,7 +46,7 @@ ProtectSystem=full
# … except TLS/SSL, ACME, and Let's Encrypt certificates # … except TLS/SSL, ACME, and Let's Encrypt certificates
# and /var/log/, because we want a place where logs can go. # and /var/log/, because we want a place where logs can go.
# This merely retains r/w access rights, it does not add any new. Must still be writable on the host! # This merely retains r/w access rights, it does not add any new. Must still be writable on the host!
ReadWriteDirectories=/etc/walnut /var/log/walnut /var/walnut /opt/walnut /srv/www ReadWriteDirectories=/etc/walnut /var/log/walnut /var/walnut /opt/walnut /srv/walnut
# Note: in v231 and above ReadWritePaths has been renamed to ReadWriteDirectories # Note: in v231 and above ReadWritePaths has been renamed to ReadWriteDirectories
; ReadWritePaths=/etc/walnut /var/log/walnut ; ReadWritePaths=/etc/walnut /var/log/walnut

View File

@ -40,13 +40,15 @@ installer_base="https://git.daplie.com/Daplie/walnut.js/raw/$my_app_ver"
# #
echo "Installing to $my_tmp (will be moved after install)" echo "Installing to $my_tmp (will be moved after install)"
#mkdir -p $my_tmp/opt/$my_app_name/lib/node_modules/$my_app_name #mkdir -p $my_tmp/opt/$my_app_name/lib/node_modules/$my_app_name
mkdir -p $my_tmp/opt/walnut/lib/node_modules/$my_app_name mkdir -p $my_tmp/opt/$my_app_name/lib/node_modules/$my_app_name
#git clone $git_base $my_tmp/opt/$my_app_name/lib/node_modules/$my_app_name #git clone $git_base $my_tmp/opt/$my_app_name/lib/node_modules/$my_app_name
git clone $git_base $my_tmp/opt/$my_app_name/core git clone $git_base $my_tmp/opt/$my_app_name/core
#pushd $my_tmp/opt/$my_app_name/lib/node_modules/$my_app_name #pushd $my_tmp/opt/$my_app_name/lib/node_modules/$my_app_name
pushd $my_tmp/opt/$my_app_name/core pushd $my_tmp/opt/$my_app_name/core
git checkout $my_app_ver git checkout $my_app_ver
mkdir -p "$my_tmp/{etc,opt,srv,var}/$my_app_name"
mkdir -p "$my_tmp/var/log/$my_app_name"
mkdir -p "$my_tmp/opt/$my_app_name"/{bin,config,core,etc,lib,node_modules,var} mkdir -p "$my_tmp/opt/$my_app_name"/{bin,config,core,etc,lib,node_modules,var}
ln -s ../core/$my_app_name/bin/$my_app_name.js $my_tmp/opt/$my_app_name/bin/$my_app_name ln -s ../core/$my_app_name/bin/$my_app_name.js $my_tmp/opt/$my_app_name/bin/$my_app_name
ln -s ../core/$my_app_name/bin/$my_app_name.js $my_tmp/opt/$my_app_name/bin/$my_app_name.js ln -s ../core/$my_app_name/bin/$my_app_name.js $my_tmp/opt/$my_app_name/bin/$my_app_name.js