diff --git a/Library/LaunchDaemons/com.daplie.goldilocks.web.plist b/dist/Library/LaunchDaemons/com.daplie.goldilocks.web.plist similarity index 100% rename from Library/LaunchDaemons/com.daplie.goldilocks.web.plist rename to dist/Library/LaunchDaemons/com.daplie.goldilocks.web.plist diff --git a/etc/goldilocks/goldilocks.example.yml b/dist/etc/goldilocks/goldilocks.example.yml similarity index 100% rename from etc/goldilocks/goldilocks.example.yml rename to dist/etc/goldilocks/goldilocks.example.yml diff --git a/etc/goldilocks/goldilocks.yml b/dist/etc/goldilocks/goldilocks.yml similarity index 100% rename from etc/goldilocks/goldilocks.yml rename to dist/etc/goldilocks/goldilocks.yml diff --git a/etc/systemd/system/goldilocks.service b/dist/etc/systemd/system/goldilocks.service similarity index 100% rename from etc/systemd/system/goldilocks.service rename to dist/etc/systemd/system/goldilocks.service diff --git a/etc/tmpfiles.d/goldilocks.conf b/dist/etc/tmpfiles.d/goldilocks.conf similarity index 100% rename from etc/tmpfiles.d/goldilocks.conf rename to dist/etc/tmpfiles.d/goldilocks.conf diff --git a/install.sh b/install.sh index bf38f84..e09acfd 100644 --- a/install.sh +++ b/install.sh @@ -1,224 +1,107 @@ #!/bin/bash -# something or other about android and tmux using PREFIX -#: "${PREFIX:=''}" -MY_ROOT="" -if [ -z "${PREFIX-}" ]; then - MY_ROOT="" -else - MY_ROOT="$PREFIX" -fi -# Not every platform has or needs sudo, gotta save them O(1)s... -sudo_cmd="" -((EUID)) && [[ -z "$ANDROID_ROOT" ]] && sudo_cmd="sudo" - -############################### -# # -# http_get # -# boilerplate for curl / wget # -# # -############################### - -# See https://git.daplie.com/Daplie/daplie-snippets/blob/master/bash/http-get.sh - -http_get="" -http_opts="" -http_out="" - -detect_http_get() -{ - if type -p curl >/dev/null 2>&1; then - http_get="curl" - http_opts="-fsSL" - http_out="-o" - elif type -p wget >/dev/null 2>&1; then - http_get="wget" - http_opts="--quiet" - http_out="-O" - else - echo "Aborted, could not find curl or wget" - return 7 - fi -} - -dap_dl() -{ - $http_get $http_opts $http_out "$2" "$1" - touch "$2" -} - -dap_dl_bash() -{ - dap_url=$1 - #dap_args=$2 - rm -rf dap-tmp-runner.sh - $http_get $http_opts $http_out dap-tmp-runner.sh "$dap_url"; bash dap-tmp-runner.sh; rm dap-tmp-runner.sh -} - -detect_http_get - -## END HTTP_GET ## - - - -################### -# # -# Install service # -# # -################### - -my_app_name=goldilocks -my_app_pkg_name=com.daplie.goldilocks.web -my_app_dir=$(mktemp -d) -installer_base="https://git.daplie.com/Daplie/goldilocks.js/raw/master" - -my_app_etc_config="etc/${my_app_name}/${my_app_name}.yml" -my_app_etc_example_config="etc/${my_app_name}/${my_app_name}.example.yml" -my_app_systemd_service="etc/systemd/system/${my_app_name}.service" -my_app_systemd_tmpfiles="etc/tmpfiles.d/${my_app_name}.conf" -my_app_launchd_service="Library/LaunchDaemons/${my_app_pkg_name}.plist" - -install_for_systemd() -{ - echo "" - echo "Installing as systemd service" - echo "" - mkdir -p $(dirname "$my_app_dir/$my_app_systemd_service") - dap_dl "$installer_base/$my_app_systemd_service" "$my_app_dir/$my_app_systemd_service" - $sudo_cmd mv "$my_app_dir/$my_app_systemd_service" "$MY_ROOT/$my_app_systemd_service" - $sudo_cmd chown -R root:root "$MY_ROOT/$my_app_systemd_service" - $sudo_cmd chmod 644 "$MY_ROOT/$my_app_systemd_service" - - mkdir -p $(dirname "$my_app_dir/$my_app_systemd_tmpfiles") - dap_dl "$installer_base/$my_app_systemd_tmpfiles" "$my_app_dir/$my_app_systemd_tmpfiles" - $sudo_cmd mv "$my_app_dir/$my_app_systemd_tmpfiles" "$MY_ROOT/$my_app_systemd_tmpfiles" - $sudo_cmd chown -R root:root "$MY_ROOT/$my_app_systemd_tmpfiles" - $sudo_cmd chmod 644 "$MY_ROOT/$my_app_systemd_tmpfiles" - - $sudo_cmd systemctl stop "${my_app_name}.service" >/dev/null 2>/dev/null - $sudo_cmd systemctl daemon-reload - $sudo_cmd systemctl start "${my_app_name}.service" - $sudo_cmd systemctl enable "${my_app_name}.service" - - echo "$my_app_name started with systemctl, check its status like so" - echo " $sudo_cmd systemctl status $my_app_name" - echo " $sudo_cmd journalctl -xe -u goldilocks" -} - -install_for_launchd() -{ - echo "" - echo "Installing as launchd service" - echo "" - # See http://www.launchd.info/ - mkdir -p $(dirname "$my_app_dir/$my_app_launchd_service") - dap_dl "$installer_base/$my_app_launchd_service" "$my_app_dir/$my_app_launchd_service" - $sudo_cmd mv "$my_app_dir/$my_app_launchd_service" "$MY_ROOT/$my_app_launchd_service" - $sudo_cmd chown root:wheel "$MY_ROOT/$my_app_launchd_service" - $sudo_cmd chmod 0644 "$MY_ROOT/$my_app_launchd_service" - $sudo_cmd launchctl unload -w "$MY_ROOT/$my_app_launchd_service" >/dev/null 2>/dev/null - $sudo_cmd launchctl load -w "$MY_ROOT/$my_app_launchd_service" - - echo "$my_app_name started with launchd" -} - -install_etc_config() -{ - $sudo_cmd mkdir -p $(dirname "$MY_ROOT/$my_app_etc_example_config") - mkdir -p $(dirname "$my_app_dir/$my_app_etc_example_config") - dap_dl "$installer_base/$my_app_etc_example_config" "$my_app_dir/$my_app_etc_example_config" - $sudo_cmd mv "$my_app_dir/$my_app_etc_example_config" "$MY_ROOT/$my_app_etc_example_config" - - if [ ! -e "$MY_ROOT/$my_app_etc_config" ]; then - $sudo_cmd mkdir -p $(dirname "$MY_ROOT/$my_app_etc_config") - mkdir -p $(dirname "$my_app_dir/$my_app_etc_config") - dap_dl "$installer_base/$my_app_etc_config" "$my_app_dir/$my_app_etc_config" - $sudo_cmd mv "$my_app_dir/$my_app_etc_config" "$MY_ROOT/$my_app_etc_config" - fi - - # OS X - $sudo_cmd chown -R _www:_www $(dirname "$MY_ROOT/$my_app_etc_config") || true - # Linux - $sudo_cmd chown -R www-data:www-data $(dirname "$MY_ROOT/$my_app_etc_config") || true - $sudo_cmd chmod 775 $(dirname "$MY_ROOT/$my_app_etc_config") - $sudo_cmd chmod 664 "$MY_ROOT/$my_app_etc_config" -} - -install_service() -{ - install_etc_config - - installable="" - if [ -d "$MY_ROOT/etc/systemd/system" ]; then - install_for_systemd - installable="true" - fi - if [ -d "/Library/LaunchDaemons" ]; then - install_for_launchd - installable="true" - fi - if [ -z "$installable" ]; then - echo "" - echo "Unknown system service init type. You must install as a system service manually." - echo '(please file a bug with the output of "uname -a")' - echo "" - fi -} - -## END SERVICE_INSTALL ## - - - set -e set -u -# Install -# TODO install to tmp location, then move to /opt -export NODE_PATH=/opt/goldilocks/lib/node_modules -export NPM_CONFIG_PREFIX=/opt/goldilocks -$sudo_cmd mkdir -p /etc/goldilocks -$sudo_cmd mkdir -p /var/log/goldilocks -$sudo_cmd mkdir -p /srv/www -$sudo_cmd mkdir -p /var/www -$sudo_cmd mkdir -p /opt/goldilocks/{lib,bin,etc} +source ./installer/sudo-cmd.sh -# Dependencies -dap_dl_bash "https://git.daplie.com/Daplie/node-install-script/raw/master/setup-min.sh" +### IMPORTANT ### +### VERSION ### +#my_app_ver="v1.1" +my_app_ver="installer-v2" +export NODE_VERSION="v8.9.0" +################# -# Change to user perms -# OS X or Linux -$sudo_cmd chown -R $(whoami) /opt/goldilocks/ || true -my_npm="$NPM_CONFIG_PREFIX/bin/npm" -$my_npm install -g npm@4 -$my_npm install -g 'git+https://git@git.daplie.com/Daplie/goldilocks.js.git' -# Finish up with submodule -pushd /opt/goldilocks/lib/node_modules/goldilocks -bash ./update-packages.sh +my_app_name=goldilocks +my_app_pkg_name=com.daplie.goldilocks.web +my_app_dir=$(mktemp -d) +my_app_dist=$my_app_dir/opt/goldilocks/lib/node_modules/goldilocks/dist +git_base="https://git.daplie.com/Daplie/goldilocks.js.git" +installer_base="https://git.daplie.com/Daplie/goldilocks.js/raw/$my_app_ver" + + + +# +# Install to tmp location, then move to /opt +# +echo "Installing to $my_app_dir (will be moved after install)" +mkdir -p $my_app_dir/opt/goldilocks/lib/node_modules/goldilocks +git clone $git_base $my_app_dir/opt/goldilocks/lib/node_modules/goldilocks +mkdir -p $my_app_dir/opt/$my_app_name/{lib,bin,etc} +cat "$my_app_dist/etc/$my_app_name/$my_app_name.example.yml" > "$my_app_dir/etc/$my_app_name/$my_app_name.example.yml" +chmod 775 "$my_app_dir/etc/$my_app_name" +chmod 664 "$my_app_dir/etc/$my_app_name/$my_app_name.example.yml" +mkdir -p $my_app_dir/srv/www +mkdir -p $my_app_dir/var/www +mkdir -p $my_app_dir/var/log/$my_app_name +pushd $my_app_dir/opt/goldilocks/lib/node_modules/goldilocks + git checkout $my_app_ver popd -# Change to admin perms -# OS X -$sudo_cmd chown -R _www:_www /var/www /srv/www /opt/goldilocks || true -# Linux -$sudo_cmd chown -R www-data:www-data /var/www /srv/www /opt/goldilocks || true + +# +# Dependencies +# +echo $NODE_VERSION > /tmp/NODEJS_VER +export NODE_PATH=$my_app_dir/opt/goldilocks/lib/node_modules +export NPM_CONFIG_PREFIX=$my_app_dir/opt/goldilocks +http_bash "https://git.coolaj86.com/coolaj86/node-installer.sh/raw/v1.1/install.sh" +my_npm="$NPM_CONFIG_PREFIX/bin/npm" +$my_npm install -g npm@4 +pushd $my_app_dir/opt/goldilocks/lib/node_modules/goldilocks/packages/assets + OAUTH3_GIT_URL="https://git.daplie.com/Oauth3/oauth3.js.git" + git clone ${OAUTH3_GIT_URL} oauth3.org || true + ln -s oauth3.org org.oauth3 + pushd oauth3.org + git remote set-url origin ${OAUTH3_GIT_URL} + git checkout v1.2 + git pull + popd + + ln -s jquery.com com.jquery + mkdir -p jquery.com + pushd jquery.com + http_get 'https://code.jquery.com/jquery-3.1.1.js' jquery-3.1.1.js + popd + + ln -s google.com com.google + mkdir -p google.com + pushd google.com + http_get 'https://ajax.googleapis.com/ajax/libs/angularjs/1.6.2/angular.min.js' angular.1.6.2.min.js + popd + + ln -s well-known .well-known + mkdir -p well-known + pushd well-known + ln -snf ../oauth3.org/well-known/oauth3 ./oauth3 + popd +popd + + + +# +# System Service +# +source ./installer/my-root.sh +echo "Pre-installation to $my_app_dir complete, now installing to $my_root/" + +source ./installer/my-user-my-group.sh +echo "User $my_user Group $my_group" + +$sudo_cmd chown -R $my_user:$my_group $my_app_dir +rsync -av $my_app_dir/ $my_root/ +rsync -av --ignore-existing $my_app_dir/etc/goldilocks/goldilocks.yml $my_root/etc/goldilocks/goldilocks.yml +source ./installer/install-system-service.sh + +# Change to admin perms +$sudo_cmd chown -R $my_user:$my_group $my_root/opt/$my_app_name +$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/goldilocks -find /opt/goldilocks -type d -exec $sudo_cmd chmod ug+s {} \; - -# Uninstall -dap_dl "https://git.daplie.com/Daplie/goldilocks.js/raw/master/uninstall.sh" "./goldilocks-uninstall" -$sudo_cmd chmod 755 "./goldilocks-uninstall" -# OS X -$sudo_cmd chown root:wheel "./goldilocks-uninstall" || true -# Linux -$sudo_cmd chown root:root "./goldilocks-uninstall" || true -$sudo_cmd mv "./goldilocks-uninstall" "/usr/local/bin/uninstall-goldilocks" - -# Install Service -install_service +$sudo_cmd chmod -R ug+rwX /opt/$my_app_name +find /opt/$my_app_name -type d -exec $sudo_cmd chmod ug+s {} \; diff --git a/installer/http-get.sh b/installer/http-get.sh new file mode 100644 index 0000000..812ed7c --- /dev/null +++ b/installer/http-get.sh @@ -0,0 +1,46 @@ +############################### +# # +# http_get # +# boilerplate for curl / wget # +# # +############################### + +# See https://git.daplie.com/Daplie/daplie-snippets/blob/master/bash/http-get.sh + +_h_http_get="" +_h_http_opts="" +_h_http_out="" + +detect_http_get() +{ + if type -p curl >/dev/null 2>&1; then + _h_http_get="curl" + _h_http_opts="-fsSL" + _h_http_out="-o" + elif type -p wget >/dev/null 2>&1; then + _h_http_get="wget" + _h_http_opts="--quiet" + _h_http_out="-O" + else + echo "Aborted, could not find curl or wget" + return 7 + fi +} + +http_get() +{ + $_h_http_get $_h_http_opts $_h_http_out "$2" "$1" + touch "$2" +} + +http_bash() +{ + _http_url=$1 + #dap_args=$2 + rm -rf dap-tmp-runner.sh + $_h_http_get $_h_http_opts $_h_http_out dap-tmp-runner.sh "$_http_url"; bash dap-tmp-runner.sh; rm dap-tmp-runner.sh +} + +detect_http_get + +## END HTTP_GET ## diff --git a/installer/install-for-launchd.sh b/installer/install-for-launchd.sh new file mode 100644 index 0000000..c29e75e --- /dev/null +++ b/installer/install-for-launchd.sh @@ -0,0 +1,20 @@ +set -u + +my_app_launchd_service="Library/LaunchDaemons/${my_app_pkg_name}.plist" + +install_for_launchd() +{ + echo "" + echo "Installing as launchd service" + echo "" + # See http://www.launchd.info/ + mkdir -p $(dirname "$my_app_dir/$my_app_launchd_service") + dap_dl "$installer_base/$my_app_launchd_service" "$my_app_dir/$my_app_launchd_service" + $sudo_cmd mv "$my_app_dir/$my_app_launchd_service" "$my_root/$my_app_launchd_service" + $sudo_cmd chown root:wheel "$my_root/$my_app_launchd_service" + $sudo_cmd chmod 0644 "$my_root/$my_app_launchd_service" + $sudo_cmd launchctl unload -w "$my_root/$my_app_launchd_service" >/dev/null 2>/dev/null + $sudo_cmd launchctl load -w "$my_root/$my_app_launchd_service" + + echo "$my_app_name started with launchd" +} diff --git a/installer/install-for-systemd.sh b/installer/install-for-systemd.sh new file mode 100644 index 0000000..2cfd4ab --- /dev/null +++ b/installer/install-for-systemd.sh @@ -0,0 +1,23 @@ +set -u + +my_app_systemd_service="etc/systemd/system/${my_app_name}.service" +my_app_systemd_tmpfiles="etc/tmpfiles.d/${my_app_name}.conf" + +install_for_systemd() +{ + echo "" + echo "Installing as systemd service" + echo "" + + safe_copy_config "$my_app_dist/$my_app_systemd_service" "$my_root/$my_app_systemd_service" + safe_copy_config "$my_app_dist/$my_app_systemd_tmpfiles" "$my_root/$my_app_systemd_tmpfiles" + + $sudo_cmd systemctl stop "${my_app_name}.service" >/dev/null 2>/dev/null + $sudo_cmd systemctl daemon-reload + $sudo_cmd systemctl start "${my_app_name}.service" + $sudo_cmd systemctl enable "${my_app_name}.service" + + echo "$my_app_name started with systemctl, check its status like so:" + echo " $sudo_cmd systemctl status $my_app_name" + echo " $sudo_cmd journalctl -xe -u $my_app_name" +} diff --git a/installer/install-system-service.sh b/installer/install-system-service.sh new file mode 100644 index 0000000..88fb998 --- /dev/null +++ b/installer/install-system-service.sh @@ -0,0 +1,39 @@ +safe_copy_config() +{ + src=$1 + dst=$2 + mkdir -p $(dirname "$dst") + if [ -f "$dst" ]; then + $sudo_cmd rsync -av "$src" "$dst.latest" + # TODO edit config file with $my_user and $my_group + if [ "$(cat $dst)" == "$(cat $dst.latest)" ]; then + $sudo_cmd rm $dst.latest + else + echo "MANUAL INTERVENTION REQUIRED: check the systemd script update and manually decide what you want to do" + echo "diff $dst $dst.latest" + $sudo_cmd chown -R root:root "$dst.latest" + fi + else + $sudo_cmd rsync -av --ignore-existing "$src" "$dst" + fi + $sudo_cmd chown -R root:root "$dst" + $sudo_cmd chmod 644 "$dst" +} + +installable="" +if [ -d "$my_root/etc/systemd/system" ]; then + install_for_systemd + installable="true" +fi +if [ -d "/Library/LaunchDaemons" ]; then + install_for_launchd + installable="true" +fi +if [ -z "$installable" ]; then + echo "" + echo "Unknown system service init type. You must install as a system service manually." + echo '(please file a bug with the output of "uname -a")' + echo "" +fi + +install_service diff --git a/installer/my-root.sh b/installer/my-root.sh new file mode 100644 index 0000000..6fec42f --- /dev/null +++ b/installer/my-root.sh @@ -0,0 +1,8 @@ +# something or other about android and tmux using PREFIX +#: "${PREFIX:=''}" +my_root="" +if [ -z "${PREFIX-}" ]; then + my_root="" +else + my_root="$PREFIX" +fi diff --git a/installer/my-user-my-group.sh b/installer/my-user-my-group.sh new file mode 100644 index 0000000..27df95a --- /dev/null +++ b/installer/my-user-my-group.sh @@ -0,0 +1,17 @@ +if [ -n "$(type -p adduser)" ]; then + $sudo_cmd adduser --home /opt/$my_app_name --gecos '' --disabled-password $my_app_name + my_user=$my_app_name + my_group=$my_app_name +elif [ -n "$(cat /etc/passwd | grep www-data:)" ]; then + # Linux (Ubuntu) + my_user=www-data + my_group=www-data +elif [ -n "$(cat /etc/passwd | grep _www:)" ]; then + # Mac + my_user=_www + my_group=_www +else + # Unsure + my_user=$(whoami) + my_group=$(id -g -n) +fi diff --git a/installer/sudo-cmd.sh b/installer/sudo-cmd.sh new file mode 100644 index 0000000..78fae2b --- /dev/null +++ b/installer/sudo-cmd.sh @@ -0,0 +1,5 @@ +# Not every platform has or needs sudo, gotta save them O(1)s... +sudo_cmd="" +if [ -n "$(type -p sudo)" ]; then + ((EUID)) && [[ -z "$ANDROID_ROOT" ]] && sudo_cmd="sudo" +fi diff --git a/uninstall.sh b/uninstall.sh deleted file mode 100644 index ce873fa..0000000 --- a/uninstall.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# something or other about android and tmux using PREFIX -#: "${PREFIX:=''}" -MY_ROOT="" -if [ -z "${PREFIX-}" ]; then - MY_ROOT="" -else - MY_ROOT="$PREFIX" -fi -# Not every platform has or needs sudo, gotta save them O(1)s... -sudo_cmd="" -((EUID)) && [[ -z "$ANDROID_ROOT" ]] && sudo_cmd="sudo" - -# you don't want any oopsies when an rm -rf is involved... -set -e -set -u - -my_app_name=goldilocks -my_app_pkg_name=com.daplie.goldilocks.web - -my_app_etc_config="etc/${my_app_name}/${my_app_name}.yml" -my_app_systemd_service="etc/systemd/system/${my_app_name}.service" -my_app_systemd_tmpfiles="etc/tmpfiles.d/${my_app_name}.conf" -my_app_launchd_service="Library/LaunchDaemons/${my_app_pkg_name}.plist" -my_app_upstart_service="etc/init.d/${my_app_name}.conf" - - -$sudo_cmd rm -f /usr/local/bin/$my_app_name -$sudo_cmd rm -f /usr/local/bin/uninstall-$my_app_name -$sudo_cmd rm -rf /usr/local/lib/node_modules/$my_app_name - -$sudo_cmd rm -f "$MY_ROOT/$my_app_etc_config" -$sudo_cmd rmdir -p $(dirname "$MY_ROOT/$my_app_etc_config") 2>/dev/null || true -$sudo_cmd rm -f "$MY_ROOT/$my_app_systemd_service" -$sudo_cmd rm -f "$MY_ROOT/$my_app_systemd_tmpfiles" -$sudo_cmd rm -f "$MY_ROOT/$my_app_launchd_service" -$sudo_cmd rm -f "$MY_ROOT/$my_app_upstart_service" - -$sudo_cmd rm -rf /opt/$my_app_name -$sudo_cmd rm -rf /var/log/$my_app_name - -# TODO flag for --purge -#rm -rf /etc/goldilocks - -# TODO trap uninstall function - -echo "uninstall complete: $my_app_name" diff --git a/update-packages.sh b/update-packages.sh deleted file mode 100755 index a62e069..0000000 --- a/update-packages.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -set -e -set -u - -pushd $(dirname ${0})/packages/assets - -OAUTH3_GIT_URL="https://git.daplie.com/Oauth3/oauth3.js.git" -git clone ${OAUTH3_GIT_URL} org.oauth3 || true -pushd org.oauth3 -git remote set-url origin ${OAUTH3_GIT_URL} -git checkout master -git pull -popd - -mkdir -p com.jquery -pushd com.jquery -curl -o jquery-3.1.1.js 'https://code.jquery.com/jquery-3.1.1.js' -popd - -mkdir -p com.google -pushd com.google -curl -o angular.1.6.2.min.js 'https://ajax.googleapis.com/ajax/libs/angularjs/1.6.2/angular.min.js' -popd - -mkdir -p well-known -pushd well-known -ln -snf ../org.oauth3/well-known/oauth3 ./oauth3 -popd - -popd