diff --git a/root/usr/libexec/apps/ghostblog/ghostblog.sh b/root/usr/libexec/apps/ghostblog/ghostblog.sh index cd4b9b6..636885e 100644 --- a/root/usr/libexec/apps/ghostblog/ghostblog.sh +++ b/root/usr/libexec/apps/ghostblog/ghostblog.sh @@ -4,112 +4,98 @@ ACTION=${1} shift 1 get_image() { - IMAGE_NAME="ghost" + IMAGE_NAME=$(uci get ghostblog.@ghostblog[0].image_name 2>/dev/null) } do_install_detail() { - local config=`uci get ghostblog.@ghostblog[0].config_path 2>/dev/null` - local port=`uci get ghostblog.@ghostblog[0].port 2>/dev/null` - local IMAGE_NAME=`uci get ghostblog.@ghostblog[0].image_name 2>/dev/null` - - #Generate the generic environment variables for the docker-compose + local config=$(uci get ghostblog.@ghostblog[0].config_path 2>/dev/null) + local port=$(uci get ghostblog.@ghostblog[0].port 2>/dev/null) + local IMAGE_NAME=$(uci get ghostblog.@ghostblog[0].image_name 2>/dev/null) GEN_PASS=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo) GEN_PASS2=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo) - - # Get our local LAN IP Address + LAN_IP=$(uci get network.lan.ipaddr) - # Strip trailing network mask LAN_IP="${LAN_IP%/*}" - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi + [ -z "$config" ] && echo "config path is empty!" && exit 1 [ -z "$port" ] && port=2368 [ -z "$IMAGE_NAME" ] && IMAGE_NAME=ghost - - # Create Docker Compose file with custom variables - - # Create Docker Compose file with custom variables -touch docker-compose.yml -cat > docker-compose.yml < /opt/docker2/compose/ghost-app/docker-compose.yml <