feat: prepare ground for config directory changes

This commit is contained in:
Jose Diaz-Gonzalez
2017-09-11 03:53:05 -04:00
parent 733bbbe0dd
commit f107265e3b
4 changed files with 14 additions and 4 deletions

View File

@@ -1,12 +1,16 @@
#!/usr/bin/env bash #!/usr/bin/env bash
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config" source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config"
[[ " help $PLUGIN_COMMAND_PREFIX:help " == *" $1 "* ]] || [[ "$1" == "$PLUGIN_COMMAND_PREFIX:"* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT" [[ " help $PLUGIN_COMMAND_PREFIX:help " == *" $1 "* ]] || [[ "$1" == "$PLUGIN_COMMAND_PREFIX:"* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
source "$PLUGIN_BASE_PATH/common/functions"
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/help-functions" source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/help-functions"
if [[ ! -d $PLUGIN_CONFIG_ROOT ]]; then
dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugin:install"
fi
if [[ ! -d $PLUGIN_DATA_ROOT ]]; then if [[ ! -d $PLUGIN_DATA_ROOT ]]; then
source "$PLUGIN_BASE_PATH/common/functions"
dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugin:install" dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugin:install"
fi fi

1
config
View File

@@ -4,6 +4,7 @@ export POSTGRES_IMAGE_VERSION=${POSTGRES_IMAGE_VERSION:="9.6.4"}
export POSTGRES_ROOT=${POSTGRES_ROOT:="/var/lib/dokku/services/postgres"} export POSTGRES_ROOT=${POSTGRES_ROOT:="/var/lib/dokku/services/postgres"}
export PLUGIN_COMMAND_PREFIX="postgres" export PLUGIN_COMMAND_PREFIX="postgres"
export PLUGIN_CONFIG_ROOT="${DOKKU_LIB_ROOT}/config/${PLUGIN_COMMAND_PREFIX}"
export PLUGIN_DATA_ROOT=$POSTGRES_ROOT export PLUGIN_DATA_ROOT=$POSTGRES_ROOT
export PLUGIN_DATASTORE_PORTS=(5432) export PLUGIN_DATASTORE_PORTS=(5432)
export PLUGIN_DATASTORE_WAIT_PORT=5432 export PLUGIN_DATASTORE_WAIT_PORT=5432

View File

@@ -88,6 +88,8 @@ fn-help-contents-subcommand() {
fi fi
args="$(fn-help-subcommand-args "$CLEAN_FILE" "$FULL_OUTPUT")" args="$(fn-help-subcommand-args "$CLEAN_FILE" "$FULL_OUTPUT")"
SUBCOMMAND=":$SUBCOMMAND"
[[ "$SUBCOMMAND" == ":default" ]] && SUBCOMMAND=""
cmd_line="$(echo -e "${SUBCOMMAND} ${args}" | sed -e 's/[[:space:]]*$//')" cmd_line="$(echo -e "${SUBCOMMAND} ${args}" | sed -e 's/[[:space:]]*$//')"
desc="$(grep desc "$CLEAN_FILE" | head -1)" desc="$(grep desc "$CLEAN_FILE" | head -1)"
eval "$desc" eval "$desc"
@@ -98,13 +100,13 @@ fn-help-contents-subcommand() {
NORMAL="\033[m" NORMAL="\033[m"
LIGHT_GRAY="\033[2;37m" LIGHT_GRAY="\033[2;37m"
LIGHT_RED="\033[1;31m" LIGHT_RED="\033[1;31m"
CMD_OUTPUT="$(echo -e " ${PLUGIN_COMMAND_PREFIX}:${cmd_line}, ${LIGHT_GRAY}${desc}${NORMAL}")" CMD_OUTPUT="$(echo -e " ${PLUGIN_COMMAND_PREFIX}${cmd_line}, ${LIGHT_GRAY}${desc}${NORMAL}")"
if [[ "$FULL_OUTPUT" != "true" ]]; then if [[ "$FULL_OUTPUT" != "true" ]]; then
echo "$CMD_OUTPUT" echo "$CMD_OUTPUT"
return 0 return 0
fi fi
echo -e "${BOLD}usage:${NORMAL} dokku ${PLUGIN_COMMAND_PREFIX}:${cmd_line}" echo -e "${BOLD}usage:${NORMAL} dokku ${PLUGIN_COMMAND_PREFIX}${cmd_line}"
echo '' echo ''
echo -e "${BOLD}${desc}${NORMAL}" echo -e "${BOLD}${desc}${NORMAL}"
echo '' echo ''

View File

@@ -16,9 +16,12 @@ plugin-install() {
pull-docker-image "dokkupaas/s3backup:0.8.0" pull-docker-image "dokkupaas/s3backup:0.8.0"
pull-docker-image "busybox:latest" pull-docker-image "busybox:latest"
mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE directory" mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE data directory"
chown dokku:dokku "$PLUGIN_DATA_ROOT" chown dokku:dokku "$PLUGIN_DATA_ROOT"
mkdir -p "$PLUGIN_CONFIG_ROOT" || echo "Failed to create $PLUGIN_SERVICE config directory"
chown dokku:dokku "$PLUGIN_CONFIG_ROOT"
rm -f "/etc/sudoers.d/dokku-${PLUGIN_COMMAND_PREFIX}*" rm -f "/etc/sudoers.d/dokku-${PLUGIN_COMMAND_PREFIX}*"
_SUDOERS_FILE="/etc/sudoers.d/dokku-${PLUGIN_COMMAND_PREFIX}" _SUDOERS_FILE="/etc/sudoers.d/dokku-${PLUGIN_COMMAND_PREFIX}"