clone/nocodb
1
0
Fork 0
mirror of https://github.com/nocodb/nocodb.git synced 2026-02-01 23:48:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: update advanced options

Browse Source
This commit is contained in:
DarkPhoenix2704
2024-11-19 12:06:12 +05:30
parent 88534be653
commit 0c72b6e552
8 changed files with 187 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
docker-compose/1_Auto_Upstall/noco.sh
View File

@@ -372,6 +372,13 @@ read_number_range() {
done
}
print_empty_line() {
local count=${1:-1}
for ((i=0; i<count; i++)); do
echo
done
}
check_if_docker_is_running() {
if ! $CONFIG_DOCKER_COMMAND ps >/dev/null 2>&1; then
print_warning "Docker is not running. Most of the commands will not work without Docker."
@@ -475,23 +482,149 @@ check_system_requirements() {
}
get_user_inputs() {
CONFIG_DOMAIN_NAME=$(prompt "Enter the IP address or domain name for the NocoDB instance" "$(get_public_ip)")
clear
cat << EOF
╔════════════════════════════════════════╗
║ NocoDB Configuration Assistant ║
╚════════════════════════════════════════╝
EOF
print_empty_line
echo -e "${BOLD}Starting basic configuration...${NC}"
print_empty_line
if is_valid_domain "$CONFIG_DOMAIN_NAME"; then
CONFIG_SSL_ENABLED="$(prompt_oneof "Do you want to configure SSL for $CONFIG_DOMAIN_NAME" "Y" "N")"
else
CONFIG_SSL_ENABLED="N"
fi
# Domain Configuration
CONFIG_DOMAIN_NAME=$(prompt "Enter the IP address or domain name for the NocoDB instance" "$(get_public_ip)")
print_empty_line
echo -e "${BLUE}→ Using domain:${NC} $CONFIG_DOMAIN_NAME"
set_default_options
if is_valid_domain "$CONFIG_DOMAIN_NAME"; then
echo -e "${GREEN}✓ Valid domain detected${NC}"
print_empty_line
CONFIG_SSL_ENABLED=$(prompt_oneof "Do you want to configure SSL for $CONFIG_DOMAIN_NAME" "Y" "N")
if [ "$CONFIG_SSL_ENABLED" = "Y" ]; then
echo -e "${BLUE}→ SSL will be enabled${NC}"
else
echo -e "${BLUE}→ SSL will not be enabled${NC}"
fi
print_empty_line
else
echo -e "${YELLOW}! Using IP address - SSL will not be enabled${NC}"
print_empty_line
CONFIG_SSL_ENABLED="N"
fi
if confirm "Show Advanced Options?"; then
get_advanced_options
fi
# Storage Configuration
echo -e "${BOLD}Configuring storage options...${NC}"
print_empty_line
CONFIG_MINIO_ENABLED=$(prompt_oneof "Do you want to enable Minio for file storage?" "Y" "N")
if [ "$CONFIG_MINIO_ENABLED" = "Y" ]; then
print_empty_line
echo -e "${BLUE}→ Setting up MinIO storage configuration${NC}"
while true; do
CONFIG_MINIO_DOMAIN_NAME=$(prompt "Enter the MinIO domain name" "$(get_public_ip)")
if [ "$CONFIG_MINIO_DOMAIN_NAME" = "$CONFIG_DOMAIN_NAME" ]; then
print_empty_line
cat << EOF
⚠️ WARNING: Using the same domain name for both NocoDB and MinIO is not recommended
This may cause routing conflicts and service accessibility issues
EOF
print_empty_line
if [ "$(prompt_oneof "Would you like to use a different domain for MinIO?" "Y" "N")" = "Y" ]; then
continue
else
echo -e "${YELLOW}! Proceeding with same domain name - please ensure proper routing configuration${NC}"
print_empty_line
fi
fi
break
done
echo -e "${BLUE}→ Using MinIO domain:${NC} $CONFIG_MINIO_DOMAIN_NAME"
print_empty_line
# SSL Configuration for MinIO
if [ "$CONFIG_SSL_ENABLED" = "Y" ]; then
if ! is_valid_domain "$CONFIG_MINIO_DOMAIN_NAME"; then
cat << EOF
⚠️ WARNING: Your MinIO domain name is not valid. File attachments will not work with SSL enabled.${NC}
EOF
print_empty_line
if [ "$(prompt_oneof "Would you like to update the MinIO domain name?" "Y" "N")" = "Y" ]; then
CONFIG_MINIO_DOMAIN_NAME=$(prompt "Enter a valid domain name for MinIO" "")
echo -e "${BLUE}→ Updated MinIO domain to:${NC} $CONFIG_MINIO_DOMAIN_NAME"
print_empty_line
fi
fi
fi
if is_valid_domain "$CONFIG_MINIO_DOMAIN_NAME"; then
echo -e "${GREEN}✓ Valid MinIO domain detected${NC}"
print_empty_line
if [ "$CONFIG_SSL_ENABLED" = "Y" ]; then
CONFIG_MINIO_SSL_ENABLED="Y"
echo -e "${BLUE}→ SSL will be automatically enabled for MinIO${NC}"
print_empty_line
else
CONFIG_MINIO_SSL_ENABLED=$(prompt_oneof "Do you want to configure SSL for $CONFIG_MINIO_DOMAIN_NAME" "Y" "N")
if [ "$CONFIG_MINIO_SSL_ENABLED" = "Y" ]; then
echo -e "${BLUE}→ SSL will be enabled for MinIO${NC}"
else
echo -e "${BLUE}→ SSL will not be enabled for MinIO${NC}"
fi
print_empty_line
fi
else
echo -e "${YELLOW}! Using IP address for MinIO - SSL will not be enabled${NC}"
print_empty_line
CONFIG_MINIO_SSL_ENABLED="N"
fi
else
print_empty_line
echo -e "${BLUE}→ MinIO storage will not be configured${NC}"
print_empty_line
fi
# Advanced Configuration
if [ "$(prompt_oneof "Show Advanced Options?" "Y" "N")" = "Y" ]; then
print_empty_line
cat << EOF
╔════════════════════════════════════════╗
║ Advanced Configuration ║
╚════════════════════════════════════════╝
EOF
print_empty_line
get_advanced_options
else
print_empty_line
echo -e "${BLUE}→ Using default options for advanced settings${NC}"
print_empty_line
set_default_options
fi
# Configuration Summary
print_empty_line 2
cat << EOF
╔════════════════════════════════════════╗
║ Configuration Summary ║
╚════════════════════════════════════════╝
EOF
print_empty_line
echo -e "${BOLD}NocoDB Domain:${NC} $CONFIG_DOMAIN_NAME"
echo -e "${BOLD}NocoDB SSL:${NC} $CONFIG_SSL_ENABLED"
if [ "$CONFIG_MINIO_ENABLED" = "Y" ]; then
echo -e "${BOLD}MinIO Domain:${NC} $CONFIG_MINIO_DOMAIN_NAME"
echo -e "${BOLD}MinIO SSL:${NC} $CONFIG_MINIO_SSL_ENABLED"
fi
print_empty_line
echo -e "${GREEN}✓ Configuration complete!${NC}"
print_empty_line
}
get_advanced_options() {
CONFIG_EDITION=$(prompt_oneof "Choose Community or Enterprise Edition" "CE" "EE")
CONFIG_EDITION=$(prompt_oneof "Choose Community or Enterprise Edition" "CE" "EE")
if [ "$CONFIG_EDITION" = "EE" ]; then
CONFIG_LICENSE_KEY=$(prompt_required "Enter the NocoDB license key")
@@ -500,19 +633,6 @@ get_advanced_options() {
fi
CONFIG_REDIS_ENABLED=$(prompt_oneof "Do you want to enable Redis for caching?" "Y" "N")
CONFIG_MINIO_ENABLED=$(prompt_oneof "Do you want to enable Minio for file storage?" "Y" "N")
if [ "$CONFIG_MINIO_ENABLED" = "Y" ]; then
CONFIG_MINIO_DOMAIN_NAME=$(prompt "Enter the MinIO domain name" "$(get_public_ip)")
if is_valid_domain "$CONFIG_MINIO_DOMAIN_NAME"; then
CONFIG_MINIO_SSL_ENABLED="$(prompt_oneof "Do you want to configure SSL for $CONFIG_MINIO_DOMAIN_NAME" "Y" "N")"
else
CONFIG_MINIO_SSL_ENABLED="N"
fi
fi
CONFIG_WATCHTOWER_ENABLED=$(prompt_oneof "Do you want to enable Watchtower for automatic updates?" "Y" "N")
NUM_CORES=$(get_nproc)
@@ -523,9 +643,6 @@ set_default_options() {
CONFIG_EDITION="CE"
CONFIG_POSTGRES_SQLITE="P"
CONFIG_REDIS_ENABLED="Y"
CONFIG_MINIO_ENABLED="Y"
CONFIG_MINIO_DOMAIN_NAME=$(get_public_ip)
CONFIG_MINIO_SSL_ENABLED="N"
CONFIG_WATCHTOWER_ENABLED="Y"
CONFIG_NUM_INSTANCES=1
}
@@ -815,8 +932,11 @@ EOF
start_services() {
$CONFIG_DOCKER_COMMAND compose pull
$CONFIG_DOCKER_COMMAND compose up -d
print_empty_line
print_empty_line
echo 'Waiting for Traefik to start...'
print_empty_line
sleep 5
}
@@ -831,7 +951,9 @@ display_completion_message() {
message_arr+=("NocoDB is now available at http://localhost")
fi
print_empty_line
print_box_message "${message_arr[@]}"
print_empty_line
}
management_menu() {

2
docker-compose/1_Auto_Upstall/tests/configure/setup.sh
View File

@@ -13,5 +13,5 @@ cd "$WORKING_DIR" || exit
rm -rf "$NOCO_HOME"
if [ "$1" = "setup" ]; then
../noco.sh <<< $'\n\nN\n'
../noco.sh <<< $'\n\n\nN\n'
fi

6
docker-compose/1_Auto_Upstall/tests/expects/install/default.sh
View File

@@ -12,6 +12,12 @@ spawn bash ../../noco.sh
expect "Enter the IP address or domain name for the NocoDB instance (default: localhost):"
send "\r"
expect "Do you want to enable Minio for file storage*"
send "\r"
expect "Enter the MinIO domain name*"
send "\r"
expect "Show Advanced Options*"
send "\r"

6
docker-compose/1_Auto_Upstall/tests/expects/install/ip.sh
View File

@@ -13,6 +13,12 @@ spawn bash ../../noco.sh
expect "Enter the IP address or domain name for the NocoDB instance (default: localhost):"
send "192.168.1.10\r"
expect "Do you want to enable Minio for file storage*"
send "Y\r"
expect "Enter the MinIO domain name*"
send "\r"
expect "Show Advanced Options*"
send "\r"

12
docker-compose/1_Auto_Upstall/tests/expects/install/redis.sh
View File

@@ -12,6 +12,12 @@ spawn bash ../../noco.sh
expect "Enter the IP address or domain name for the NocoDB instance (default: localhost):"
send "\r"
expect "Do you want to enable Minio for file storage*"
send "\r"
expect "Enter the MinIO domain name*"
send "\r"
expect "Show Advanced Options*"
send "Y\r"
@@ -24,12 +30,6 @@ send "P\r"
expect "Do you want to enabled Redis for caching*"
send "Y\r"
expect "Do you want to enable Minio for file storage*"
send "\r"
expect "Enter the MinIO domain name*"
send "\r"
expect "Do you want to enabled Watchtower for automatic updates*"
send "\r"

12
docker-compose/1_Auto_Upstall/tests/expects/install/scale.sh
View File

@@ -12,6 +12,12 @@ spawn bash ../../noco.sh
expect "Enter the IP address or domain name for the NocoDB instance (default: localhost):"
send "\r"
expect "Do you want to enable Minio for file storage*"
send "Y\r"
expect "Enter the MinIO domain name*"
send "\r"
expect "Show Advanced Options*"
send "Y\r"
@@ -24,12 +30,6 @@ send "P\r"
expect "Do you want to enabled Redis for caching*"
send "Y\r"
expect "Do you want to enable Minio for file storage*"
send "Y\r"
expect "Enter the MinIO domain name*"
send "\r"
expect "Do you want to enabled Watchtower for automatic updates*"
send "\r"

6
docker-compose/1_Auto_Upstall/tests/expects/install/ssl.sh
View File

@@ -14,6 +14,12 @@ spawn bash ../../noco.sh
expect "Enter the IP address or domain name for the NocoDB instance (default: localhost):"
send "${random_number}.ssl.nocodb.dev\r"
expect "Do you want to enable Minio for file storage*"
send "Y\r"
expect "Enter the MinIO domain name*"
send "\r"
expect "Show Advanced Options*"
send "y\r"

12
docker-compose/1_Auto_Upstall/tests/expects/install/watchtower.sh
View File

@@ -12,6 +12,12 @@ spawn bash ../../noco.sh
expect "Enter the IP address or domain name for the NocoDB instance (default: localhost):"
send "\r"
expect "Do you want to enable Minio for file storage*"
send "\r"
expect "Enter the MinIO domain name*"
send "\r"
expect "Show Advanced Options*"
send "Y\r"
@@ -24,12 +30,6 @@ send "P\r"
expect "Do you want to enabled Redis for caching*"
send "\r"
expect "Do you want to enable Minio for file storage*"
send "\r"
expect "Enter the MinIO domain name*"
send "\r"
expect "Do you want to enabled Watchtower for automatic updates*"
send "Y\r"