rccontrol: added reconfigure commands to alter .ini files

docker-compose-metrics.yaml

@@ -62,9 +62,9 b' services:'
     command:
       - "--config.file=/etc/prometheus/prometheus.yml"
       - "--storage.tsdb.path=/prometheus"
+      - "--storage.tsdb.retention.time=24h"
       - "--web.console.libraries=/etc/prometheus/console_libraries"
       - "--web.console.templates=/etc/prometheus/consoles"
-      - "--storage.tsdb.retention.time=24h"
       - "--web.enable-lifecycle"
 #    ports:
 #      - "9090:9090"
@@ -137,5 +137,4 b' services:'
       - rhodecode_network
     volumes:
       - /var/log:/var/log
-      - logvolume:/var/log_volume
       - ./config/promtail:/etc/promtail

scripts/monitor-unhealthy.sh

@@ -2,7 +2,7 b''
 while true
 do
   echo $(date)
-  ./rccontrol stack-upgrade rhodecode --restart-unhealthy && \
+  NO_COLOR=1 ./rccontrol stack-upgrade rhodecode --restart-unhealthy && \
   echo "Next execution in 300s..." && \
 	sleep 300
 done
  No newline at end of file

scripts/rccontrol/rccontrol

@@ -87,6 +87,30 b' rccontrol_usage() {'
     echo
 
     # :environment_variable.usage
+    echo "  RC_STACK_ROUTER_VER"
+    printf "\n"
+    printf "    Default: v1\n"
+    echo
+
+    # :environment_variable.usage
+    echo "  RC_STACK_SERVICES_VER"
+    printf "\n"
+    printf "    Default: v1\n"
+    echo
+
+    # :environment_variable.usage
+    echo "  RC_STACK_RHODECODE_VER"
+    printf "\n"
+    printf "    Default: v1\n"
+    echo
+
+    # :environment_variable.usage
+    echo "  RC_STACK_METRICS_VER"
+    printf "\n"
+    printf "    Default: v1\n"
+    echo
+
+    # :environment_variable.usage
     echo "  RCC_CONFIG"
     printf "    default config file for rccontrol\n"
     printf "    Default: .rccontrol.ini\n"
@@ -895,11 +919,13 b' rccontrol_cli_usage() {'
   echo
   # :command.usage_commands
   printf "Commands:\n"
-  echo "  redis        CLI for Redis"
-  echo "  db           CLI with Database connection"
-  echo "  db-upgrade   CLI to run db upgrade"
-  echo "  storage      CLI for repository storage. Exposes a basic image with mounted data and repositories volumes"
-  echo "  attach       attach to running instance of RhodeCode main web app"
+  echo "  redis                 CLI for Redis"
+  echo "  db                    CLI with Database connection"
+  echo "  db-upgrade            CLI to run db upgrade"
+  echo "  storage               CLI for repository storage. Exposes a basic image with mounted data and repositories volumes"
+  echo "  attach                attach to running instance of RhodeCode main web app"
+  echo "  configure-vcs         reconfigure the vcsserver.ini"
+  echo "  configure-rhodecode   reconfigure the rhodecode.ini"
   echo
 
   # :command.long_usage
@@ -1060,6 +1086,76 b' rccontrol_cli_attach_usage() {'
 }
 
 # :command.usage
+rccontrol_cli_configure_vcs_usage() {
+  if [[ -n $long_usage ]]; then
+    printf "rccontrol cli configure-vcs - reconfigure the vcsserver.ini\n"
+    echo
+
+  else
+    printf "rccontrol cli configure-vcs - reconfigure the vcsserver.ini\n"
+    echo
+
+  fi
+
+  printf "Usage:\n"
+  printf "  rccontrol cli configure-vcs [OPTIONS]\n"
+  printf "  rccontrol cli configure-vcs --help | -h\n"
+  echo
+
+  # :command.long_usage
+  if [[ -n $long_usage ]]; then
+    printf "Options:\n"
+
+    # :command.usage_fixed_flags
+    echo "  --help, -h"
+    printf "    Show this help\n"
+    echo
+
+    # :command.usage_flags
+    # :flag.usage
+    echo "  --ini-path INI_PATH"
+    printf "    Path to vcsserver.ini\n"
+    echo
+
+  fi
+}
+
+# :command.usage
+rccontrol_cli_configure_rhodecode_usage() {
+  if [[ -n $long_usage ]]; then
+    printf "rccontrol cli configure-rhodecode - reconfigure the rhodecode.ini\n"
+    echo
+
+  else
+    printf "rccontrol cli configure-rhodecode - reconfigure the rhodecode.ini\n"
+    echo
+
+  fi
+
+  printf "Usage:\n"
+  printf "  rccontrol cli configure-rhodecode [OPTIONS]\n"
+  printf "  rccontrol cli configure-rhodecode --help | -h\n"
+  echo
+
+  # :command.long_usage
+  if [[ -n $long_usage ]]; then
+    printf "Options:\n"
+
+    # :command.usage_fixed_flags
+    echo "  --help, -h"
+    printf "    Show this help\n"
+    echo
+
+    # :command.usage_flags
+    # :flag.usage
+    echo "  --ini-path INI_PATH"
+    printf "    Path to rhodecode.ini\n"
+    echo
+
+  fi
+}
+
+# :command.usage
 rccontrol_backup_db_usage() {
   if [[ -n $long_usage ]]; then
     printf "rccontrol backup-db - Backup Database\n"
@@ -1476,6 +1572,84 b' get_docker_definitions() {'
 
 }
 
+# src/lib/reconfigure_ini.sh
+config_vcsserver_ini() {
+    # workers adjustment
+    sed_replace '^#?workers = .*'            'workers = 1'
+    sed_replace '^#?memory_max_usage = .*'   'memory_max_usage = 2147483648'
+    sed_replace '^#?core\.binary_dir = .*'   'core.binary_dir = \/home\/rhodecode\/\.rccontrol\/vcsserver-1\/profile\/bin'
+
+    sed_replace '^#?rc_cache\.repo_object\.expiration_time = .*'                          'rc_cache.repo_object.expiration_time = 2592000'
+    sed_replace '^#?rc_cache\.repo_object\.backend = dogpile\.cache\.rc\.redis_msgpack'   'rc_cache.repo_object.backend = dogpile.cache.rc.redis_msgpack'
+
+    sed_replace '^#?rc_cache\.repo_object\.arguments\.socket_timeout = .*'                'rc_cache.repo_object.arguments.socket_timeout = 30'
+    sed_replace '^#?rc_cache\.repo_object\.arguments\.db = .*'                            'rc_cache.repo_object.arguments.db = 5'
+    sed_replace '^#?rc_cache\.repo_object\.arguments\.port = .*'                          'rc_cache.repo_object.arguments.port = 6379'
+    sed_replace '^#?rc_cache\.repo_object\.arguments\.host = .*'                          'rc_cache.repo_object.arguments.host = redis'
+    sed_replace '^#?rc_cache\.repo_object\.arguments\.redis_expiration_time = .*'         'rc_cache.repo_object.arguments.redis_expiration_time = 3592000'
+
+    sed_replace '^#?cache_dir = .*'   'cache_dir = \/var\/opt\/rhodecode_data'
+    sed_replace '^#?formatter = .*'   'formatter = json'
+}
+
+config_rhodecode_ini(){
+    # workers adjustment
+    sed_replace '^#?workers = .*' 'workers = 1'
+    sed_replace '^#?memory_max_usage = .*'   'memory_max_usage = 2147483648'
+
+    # email
+    sed_replace '^#?email_prefix = .*'   'email_prefix = [RhodeCode]'
+    sed_replace '^#?app_email_from = .*' "app_email_from = rhodecode-noreply@$RC_HOSTNAME"
+    sed_replace '^#?smtp_server = .*'    'smtp_server = localhost'
+
+    # set license_token
+    sed_replace '^#?license_token =.*' "license_token = $RC_LICENSE_TOKEN"
+
+    # enable celery
+    sed_replace '^#?use_celery = .*', 'use_celery = true'
+
+    # cleanup rabbitmq example entry
+    sed_replace '^#celery\.broker_url = amqp.*'  ''
+    sed_replace '^#?celery\.broker_url = .*'     'celery\.broker_url = redis:\/\/localhost:6379\/8'
+
+    # switch beaker sessions to Redis based
+    sed_replace '^#?beaker.session.type = file.*' '#beaker.session.type = file'
+    sed_replace '^#?beaker.session.data_dir = .*'  '#beaker.session.data_dir = \/tmp\/data\/sessions'
+
+    # enable redis db2
+    sed_replace '^#?beaker\.session\.type = ext:redis'                  'beaker.session.type = ext:redis'
+    sed_replace '^#?beaker\.session\.url = redis:\/\/127.0.0.1:6379\/2' 'beaker.session.url = redis:\/\/redis:6379\/2'
+
+#    sed_replace '^#?beaker.session.type = ext:database.*' 'beaker.session.type = ext:database'
+#    sed_replace '^#?beaker.session.sa.url = postgresql.*' 'beaker.session.sa.url = postgresql://{{rhodecode_db_username}}:{{rhodecode_db_password}}@localhost/{{rhodecode_db_name}}'
+
+    # enable SVN
+    sed_replace '^#?svn.proxy.generate_config = .*' 'svn.proxy.generate_config = true'
+
+    # enable SSH
+    sed_replace '^#?ssh.generate_authorized_keyfile = .*' 'ssh.generate_authorized_keyfile = true'
+
+#    # the wrapper_cmd
+#    sed_replace '^#?ssh.wrapper_cmd = .*' 'ssh.wrapper_cmd = /home/{{vm_account_name}}/dev-code/rhodecode-enterprise-ee/profile/bin/rc-ssh-wrapper'
+#
+
+#    '^#?api_access_controllers_whitelist = .*', 'api_access_controllers_whitelist = RepoFilesView:repo_archivefile, RepoFilesView:repo_file_raw'
+#
+#
+#    # set search to elasticsearch
+#      # enabled modules for Whoosh we remove, we have duplicates there..
+#    '^search.module = .*', ''
+#    '^search.location = .*', ''
+#
+#    '^#?search.module = .*', 'search.module = rc_elasticsearch'
+#    '^#?search.location = .*', 'search.location = http://localhost:9200'
+#    '^#?search.es_version = .*', 'search.es_version = 6'
+
+#    # enable Chat
+#    '^#?chat.enabled = .*', 'chat.enabled = true'
+
+}
+
 # src/lib/send_completions.sh
 send_completions() {
   echo $'# rccontrol completion                                     -*- shell-script -*-'
@@ -1615,6 +1789,13 b' send_completions() {'
   echo $'# ex: filetype=sh'
 }
 
+# src/lib/utils.sh
+random_str() {
+  len=$1
+  random_generate=$(echo $RANDOM | md5sum | head -c $len)
+  echo $random_generate
+}
+
 # src/lib/validate_stack_exists.sh
 
 validate_stack_exists() {
@@ -1662,6 +1843,8 b' rccontrol_self_update_command() {'
 
   ENV_VER=$REPLY
 
+  echo "HERE"
+  exit
   version_old=$($FINAL_TARGET --version)
 
   echo "$(green self-update: downloading new rccontrol script from $FETCH_FROM)"
@@ -1769,12 +1952,6 b' rccontrol_init_command() {'
     fi
   }
 
-  random_str() {
-    len=$1
-    random_generate=$(echo $RANDOM | md5sum | head -c $len)
-    echo $random_generate
-  }
-
   bootstrap_config() {
     shared_key=$(random_str 32)
     db_key=$(random_str 32)
@@ -2327,7 +2504,8 b' rccontrol_stack_upgrade_rhodecode_command() {'
     echo "$(yellow Found unhealthy containers $unhealthy)"
     for container in $unhealthy
     do
-      echo "restart $container"
+      docker stats --no-stream $container
+      echo "unhealthy_log: restart $container"
       docker restart --time=10 $container
     done
 
@@ -2569,6 +2747,64 b' rccontrol_cli_attach_command() {'
 }
 
 # :command.function
+rccontrol_cli_configure_vcs_command() {
+  # src/cli_configure_vcs_command.sh
+  ini_path=${args[--ini-path]}
+  DEBUG=${args[--debug]}
+
+  sed_replace() {
+
+    if [[ $DEBUG ]]; then
+      echo "pat1: $1"
+      echo "pat1: $2"
+      echo
+      echo "sed --in-place=.replaced -E \"s/$1/$2/\" $ini_path"
+    fi
+
+    sed --in-place=.replaced -E "s/$1/$2/" $ini_path
+  }
+
+  config_vcsserver_ini
+
+  echo
+  echo "reconfigure of $ini_path completed"
+
+}
+
+# :command.function
+rccontrol_cli_configure_rhodecode_command() {
+  # src/cli_configure_rhodecode_command.sh
+  ini_path=${args[--ini-path]}
+  DEBUG=${args[--debug]}
+
+  sed_replace() {
+
+    if [[ $DEBUG ]]; then
+      echo "pat1: $1"
+      echo "pat1: $2"
+      echo
+      echo "sed --in-place=.replaced -E \"s/$1/$2/\" $ini_path"
+    fi
+
+    sed --in-place=.replaced -E "s/$1/$2/" $ini_path
+  }
+
+  # read generated secrets etc from our .env file
+  .env --file $RUNTIME_ENV
+
+  .env get RC_LICENSE_TOKEN
+  RC_LICENSE_TOKEN=$REPLY
+
+  .env get RC_HOSTNAME
+  RC_HOSTNAME=$REPLY
+
+  config_rhodecode_ini
+
+  echo
+  echo "reconfigure of $ini_path completed"
+}
+
+# :command.function
 rccontrol_backup_db_command() {
   # src/backup_db_command.sh
   check_bootstrap
@@ -2671,6 +2907,10 b' parse_requirements() {'
   # :command.environment_variables_filter
   # :command.environment_variables_default
   export RC_CLI_VERSION_NAME="${RC_CLI_VERSION_NAME:-4.28.0.REL.2022.12.22}"
+  export RC_STACK_ROUTER_VER="${RC_STACK_ROUTER_VER:-v1}"
+  export RC_STACK_SERVICES_VER="${RC_STACK_SERVICES_VER:-v1}"
+  export RC_STACK_RHODECODE_VER="${RC_STACK_RHODECODE_VER:-v1}"
+  export RC_STACK_METRICS_VER="${RC_STACK_METRICS_VER:-v1}"
   export RCC_CONFIG="${RCC_CONFIG:-.rccontrol.ini}"
   export RC_STACK_ROUTER_EXT="${RC_STACK_ROUTER_EXT:-.custom/docker-compose-router.override.yaml}"
   export RC_STACK_METRICS_EXT="${RC_STACK_METRICS_EXT:-.custom/docker-compose-metrics.override.yaml}"
@@ -4135,6 +4375,20 b' rccontrol_cli_parse_requirements() {'
       shift $#
       ;;
 
+    configure-vcs)
+      action="configure-vcs"
+      shift
+      rccontrol_cli_configure_vcs_parse_requirements "$@"
+      shift $#
+      ;;
+
+    configure-rhodecode)
+      action="configure-rhodecode"
+      shift
+      rccontrol_cli_configure_rhodecode_parse_requirements "$@"
+      shift $#
+      ;;
+
     # :command.command_fallback
     "")
       rccontrol_cli_usage >&2
@@ -4392,6 +4646,122 b' rccontrol_cli_attach_parse_requirements() {'
 }
 
 # :command.parse_requirements
+rccontrol_cli_configure_vcs_parse_requirements() {
+  # :command.fixed_flags_filter
+  while [[ $# -gt 0 ]]; do
+    case "${1:-}" in
+      --help | -h)
+        long_usage=yes
+        rccontrol_cli_configure_vcs_usage
+        exit
+        ;;
+
+      *)
+        break
+        ;;
+
+    esac
+  done
+
+  # :command.command_filter
+  action="cli configure-vcs"
+
+  # :command.parse_requirements_while
+  while [[ $# -gt 0 ]]; do
+    key="$1"
+    case "$key" in
+      # :flag.case
+      --ini-path)
+
+        # :flag.case_arg
+        if [[ -n ${2+x} ]]; then
+
+          args[--ini-path]="$2"
+          shift
+          shift
+        else
+          printf "%s\n" "--ini-path requires an argument: --ini-path INI_PATH" >&2
+          exit 1
+        fi
+        ;;
+
+      -?*)
+        printf "invalid option: %s\n" "$key" >&2
+        exit 1
+        ;;
+
+      *)
+        # :command.parse_requirements_case
+        # :command.parse_requirements_case_simple
+        printf "invalid argument: %s\n" "$key" >&2
+        exit 1
+
+        ;;
+
+    esac
+  done
+
+}
+
+# :command.parse_requirements
+rccontrol_cli_configure_rhodecode_parse_requirements() {
+  # :command.fixed_flags_filter
+  while [[ $# -gt 0 ]]; do
+    case "${1:-}" in
+      --help | -h)
+        long_usage=yes
+        rccontrol_cli_configure_rhodecode_usage
+        exit
+        ;;
+
+      *)
+        break
+        ;;
+
+    esac
+  done
+
+  # :command.command_filter
+  action="cli configure-rhodecode"
+
+  # :command.parse_requirements_while
+  while [[ $# -gt 0 ]]; do
+    key="$1"
+    case "$key" in
+      # :flag.case
+      --ini-path)
+
+        # :flag.case_arg
+        if [[ -n ${2+x} ]]; then
+
+          args[--ini-path]="$2"
+          shift
+          shift
+        else
+          printf "%s\n" "--ini-path requires an argument: --ini-path INI_PATH" >&2
+          exit 1
+        fi
+        ;;
+
+      -?*)
+        printf "invalid option: %s\n" "$key" >&2
+        exit 1
+        ;;
+
+      *)
+        # :command.parse_requirements_case
+        # :command.parse_requirements_case_simple
+        printf "invalid argument: %s\n" "$key" >&2
+        exit 1
+
+        ;;
+
+    esac
+  done
+
+}
+
+# :command.parse_requirements
 rccontrol_backup_db_parse_requirements() {
   # :command.fixed_flags_filter
   while [[ $# -gt 0 ]]; do
@@ -4548,6 +4918,10 b' initialize() {'
 
   # :command.environment_variables_default
   export RC_CLI_VERSION_NAME="${RC_CLI_VERSION_NAME:-4.28.0.REL.2022.12.22}"
+  export RC_STACK_ROUTER_VER="${RC_STACK_ROUTER_VER:-v1}"
+  export RC_STACK_SERVICES_VER="${RC_STACK_SERVICES_VER:-v1}"
+  export RC_STACK_RHODECODE_VER="${RC_STACK_RHODECODE_VER:-v1}"
+  export RC_STACK_METRICS_VER="${RC_STACK_METRICS_VER:-v1}"
   export RCC_CONFIG="${RCC_CONFIG:-.rccontrol.ini}"
   export RC_STACK_ROUTER_EXT="${RC_STACK_ROUTER_EXT:-.custom/docker-compose-router.override.yaml}"
   export RC_STACK_METRICS_EXT="${RC_STACK_METRICS_EXT:-.custom/docker-compose-metrics.override.yaml}"
@@ -4905,6 +5279,24 b' run() {'
       fi
       ;;
 
+    "cli configure-vcs")
+      if [[ ${args[--help]:-} ]]; then
+        long_usage=yes
+        rccontrol_cli_configure_vcs_usage
+      else
+        rccontrol_cli_configure_vcs_command
+      fi
+      ;;
+
+    "cli configure-rhodecode")
+      if [[ ${args[--help]:-} ]]; then
+        long_usage=yes
+        rccontrol_cli_configure_rhodecode_usage
+      else
+        rccontrol_cli_configure_rhodecode_command
+      fi
+      ;;
+
     "backup-db")
       if [[ ${args[--help]:-} ]]; then
         long_usage=yes