##// END OF EJS Templates
feat(install): improved logic of init script re-run with --force...
super-admin -
Show More
@@ -2603,90 +2603,105 b' rcstack_init_command() {'
2603 2603 RHODECODE_INI_TMPL=$PWD/templates/ini/$ver/rhodecode.ini
2604 2604 VCSSERVER_INI_TMPL=$PWD/templates/ini/$ver/vcsserver.ini
2605 2605
2606 if [[ ! -f "$BOOTSTRAP_RUNTIME_ENV" ]]; then
2607 echo "bootstrap_config: init runtime env config at: $BOOTSTRAP_RUNTIME_ENV"
2606 # break if we didn't use force and definitions exist
2607 if [[ -f $BOOTSTRAP_RUNTIME_ENV && ! $force ]]; then
2608 echo "$(yellow bootstrap_config: $BOOTSTRAP_RUNTIME_ENV file exists, not adding any configuration. Use --force to create it anyway)"
2609 return
2610 fi
2608 2611
2609 # Make runtime file
2610 echo "## BOOTSTRAP GENERATED $(date) ##" >> $BOOTSTRAP_RUNTIME_ENV
2611 echo "" >> $BOOTSTRAP_RUNTIME_ENV
2612 if [[ -f $BOOTSTRAP_RUNTIME_ENV ]]; then
2613 echo "$(yellow $BOOTSTRAP_RUNTIME_ENV file exists, are you sure to force re-create it?)"
2614 while true; do
2615 read -p "Would you like to continue with overriding file? [yn] " yn
2616 case $yn in
2617 [Yy]*) break ;;
2618 [Nn]*) exit ;;
2619 *) echo "Please answer y or n." ;;
2620 esac
2621 done
2622 fi
2612 2623
2613 cat $BOOTSTRAP_TMPL >> $BOOTSTRAP_RUNTIME_ENV
2624 echo "bootstrap_config: init runtime env config at: $BOOTSTRAP_RUNTIME_ENV"
2614 2625
2615 # Make .ini files
2616 cp -v $RHODECODE_INI_TMPL $INI_TARGET
2617 cp -v $VCSSERVER_INI_TMPL $INI_TARGET
2626 # Make runtime file
2627 echo "## BOOTSTRAP GENERATED $(date) ##" >> $BOOTSTRAP_RUNTIME_ENV
2628 echo "" >> $BOOTSTRAP_RUNTIME_ENV
2618 2629
2619 # init env generator with env file
2620 .env --file "$BOOTSTRAP_RUNTIME_ENV"
2630 cat $BOOTSTRAP_TMPL >> $BOOTSTRAP_RUNTIME_ENV
2621 2631
2622 .env set RC_EDITION=$rc_edition
2623 .env set DB_PASSWORD=$db_key
2632 # Make .ini files
2633 cp -v $RHODECODE_INI_TMPL $INI_TARGET
2634 cp -v $VCSSERVER_INI_TMPL $INI_TARGET
2624 2635
2625 .env set RHODECODE_USER_EMAIL=$arg_admin_email
2626 .env set RHODECODE_USER_NAME=$arg_admin_user
2627 .env set RHODECODE_USER_PASS=$arg_admin_pass
2636 # init env generator with env file
2637 .env --file "$BOOTSTRAP_RUNTIME_ENV"
2628 2638
2629 .env set RC_ENCRYPTED_SECRET=$shared_key
2639 .env set RC_EDITION=$rc_edition
2640 .env set DB_PASSWORD=$db_key
2630 2641
2631 rc_db1="postgresql://$DB_USER:$db_key@database/$DB_NAME"
2632 .env set RC_DB_URL="$rc_db1"
2633 .env set RC_SQLALCHEMY_DB1_URL="$rc_db1"
2642 .env set RHODECODE_USER_EMAIL=$arg_admin_email
2643 .env set RHODECODE_USER_NAME=$arg_admin_user
2644 .env set RHODECODE_USER_PASS=$arg_admin_pass
2634 2645
2635 .env set RC_LICENSE_TOKEN=$license_token
2636 .env set RC_HOSTNAME=$base_domain
2646 .env set RC_ENCRYPTED_SECRET=$shared_key
2637 2647
2638 if [[ $is_https == 1 ]]; then
2639 app_base_url=https://$base_domain
2640 else
2641 app_base_url=http://$base_domain
2642 fi
2648 rc_db1="postgresql://$DB_USER:$db_key@database/$DB_NAME"
2649 .env set RC_DB_URL="$rc_db1"
2650 .env set RC_SQLALCHEMY_DB1_URL="$rc_db1"
2643 2651
2644 .env set RC_APP_BASE_URL=$app_base_url
2652 .env set RC_LICENSE_TOKEN=$license_token
2653 .env set RC_HOSTNAME=$base_domain
2645 2654
2646 .env set RC_LOKI_AUTH=loki-auth:$shared_key@
2655 if [[ $is_https == 1 ]]; then
2656 app_base_url=https://$base_domain
2657 else
2658 app_base_url=http://$base_domain
2659 fi
2647 2660
2648 .env puts '# Log formatter option'
2649 .env set RC_LOGGING_FORMATTER=$log_formatter
2650 .env set RC_USE_CELERY=true
2661 .env set RC_APP_BASE_URL=$app_base_url
2651 2662
2652 .env puts '# Channelstream config'
2653 .env set RC_CHANNELSTREAM_SERVER=channelstream:8000
2663 .env set RC_LOKI_AUTH=loki-auth:$shared_key@
2654 2664
2655 if [[ $is_https == 1 ]]; then
2656 rc_channelstream_url="wss://$base_domain/_channelstream"
2657 else
2658 rc_channelstream_url="ws://$base_domain/_channelstream"
2659 fi
2665 .env puts '# Log formatter option'
2666 .env set RC_LOGGING_FORMATTER=$log_formatter
2667 .env set RC_USE_CELERY=true
2660 2668
2661 .env set RC_CHANNELSTREAM_WS_URL=$rc_channelstream_url
2669 .env puts '# Channelstream config'
2670 .env set RC_CHANNELSTREAM_SERVER=channelstream:8000
2662 2671
2663 .env set CHANNELSTREAM_ALLOW_POSTING_FROM=0.0.0.0
2672 if [[ $is_https == 1 ]]; then
2673 rc_channelstream_url="wss://$base_domain/_channelstream"
2674 else
2675 rc_channelstream_url="ws://$base_domain/_channelstream"
2676 fi
2664 2677
2665 .env puts '# Channelstream secrets'
2666 .env set CHANNELSTREAM_SECRET=$shared_key
2667 .env set RC_CHANNELSTREAM_SECRET=$shared_key
2678 .env set RC_CHANNELSTREAM_WS_URL=$rc_channelstream_url
2668 2679
2669 .env puts '# Channelstream admin'
2670 .env set CHANNELSTREAM_ADMIN_SECRET=$shared_key
2671 .env set RC_CHANNELSTREAM_ADMIN_SECRET=$shared_key
2680 .env set CHANNELSTREAM_ALLOW_POSTING_FROM=0.0.0.0
2672 2681
2673 ini_path=$INI_TARGET/vcsserver.ini
2674 config_vcsserver_ini
2682 .env puts '# Channelstream secrets'
2683 .env set CHANNELSTREAM_SECRET=$shared_key
2684 .env set RC_CHANNELSTREAM_SECRET=$shared_key
2675 2685
2676 ini_path=$INI_TARGET/rhodecode.ini
2677 RC_EDITION=$rc_edition
2678 RC_LICENSE_TOKEN=$license_token
2679 RC_HOSTNAME=$(sed_safe_path $base_domain)
2680 RC_APP_BASE_URL=$(sed_safe_path $app_base_url)
2681 RC_SQLALCHEMY_DB1_URL=$(sed_safe_path $rc_db1)
2682 RC_CHANNELSTREAM_WS_URL=$(sed_safe_path $rc_channelstream_url)
2686 .env puts '# Channelstream admin'
2687 .env set CHANNELSTREAM_ADMIN_SECRET=$shared_key
2688 .env set RC_CHANNELSTREAM_ADMIN_SECRET=$shared_key
2683 2689
2684 config_rhodecode_ini
2690 ini_path=$INI_TARGET/vcsserver.ini
2691 config_vcsserver_ini
2692
2693 ini_path=$INI_TARGET/rhodecode.ini
2694 RC_EDITION=$rc_edition
2695 RC_LICENSE_TOKEN=$license_token
2696 RC_HOSTNAME=$(sed_safe_path $base_domain)
2697 RC_APP_BASE_URL=$(sed_safe_path $app_base_url)
2698 RC_SQLALCHEMY_DB1_URL=$(sed_safe_path $rc_db1)
2699 RC_CHANNELSTREAM_WS_URL=$(sed_safe_path $rc_channelstream_url)
2700
2701 config_rhodecode_ini
2702
2703 touch $BOOTSTRAP_RUNTIME_ENV
2685 2704
2686 touch $BOOTSTRAP_RUNTIME_ENV
2687 else
2688 echo "bootstrap_config: $BOOTSTRAP_RUNTIME_ENV file exists, not adding any configuration..."
2689 fi
2690 2705 }
2691 2706
2692 2707 bootstrap_definitions() {
@@ -2707,6 +2722,7 b' rcstack_init_command() {'
2707 2722 fi
2708 2723 done
2709 2724
2725 # break if we didn't use force and definitions exist
2710 2726 if [[ -n $DEFINITIONS_EXIST && ! $force ]]; then
2711 2727 echo "$(yellow bootstrap_definitions: skipping docker defs creation, existing files found. Use --force to create them anyway)"
2712 2728 return
@@ -2715,7 +2731,7 b' rcstack_init_command() {'
2715 2731 if [[ -n $DEFINITIONS_EXIST ]]; then
2716 2732 echo "$(yellow docker definitions exists, are you sure to force re-create them?)"
2717 2733 while true; do
2718 read -p "Would you like to continue with overriding file? [yn] " yn
2734 read -p "Would you like to continue with overriding files? [yn] " yn
2719 2735 case $yn in
2720 2736 [Yy]*) break ;;
2721 2737 [Nn]*) exit ;;
@@ -2723,6 +2739,7 b' rcstack_init_command() {'
2723 2739 esac
2724 2740 done
2725 2741 fi
2742
2726 2743 FULL_MODE=1
2727 2744 get_docker_definitions $docker_revision $FULL_MODE $DEBUG
2728 2745
@@ -6818,7 +6835,7 b' rcstack__completions_parse_requirements() {'
6818 6835
6819 6836 # :command.initialize
6820 6837 initialize() {
6821 version="5.1.0"
6838 version="5.2.0"
6822 6839 long_usage=''
6823 6840 set -e
6824 6841
General Comments 0
You need to be logged in to leave comments. Login now