rcstack: improved compatability with 4.28.0 release using rcstack

scripts/rcstack/rcstack

@@ -2107,8 +2107,6 b' config_vcsserver_ini() {'
     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 '^#?formatter = .*'   'formatter = json'
-
     #statsd enable
     sed_replace '^#?statsd.enabled = .*'       'statsd.enabled = true'
     sed_replace '^#?statsd.statsd_host = .*'   'statsd.statsd_host = statsd-exporter'
@@ -2206,9 +2204,6 b' config_rhodecode_ini() {'
     # enable Chat
     sed_replace '^#?chat.enabled = .*' 'chat.enabled = true'
 
-    # logging
-    sed_replace '^#?formatter = .*'   'formatter = json'
-
 }
 
 # src/lib/send_completions.sh
@@ -2758,14 +2753,6 b' rcstack_init_command() {'
     args['__arg_license_token']=1
   fi
 
-  if [[ -z ${args['--arg-log-formatter']} ]]; then
-    # set default
-    args['--arg-log-formatter']="json"
-  else
-    # mark we used flag and don't ask in prompts
-    args['__arg_log_formatter']=1
-  fi
-
   arg_rc_edition=${args[--arg-rc-edition]}
   arg_rc_version=${args[--arg-rc-version]}
   arg_accept_eula=${args[--arg-accept-eula]}
@@ -2776,7 +2763,6 b' rcstack_init_command() {'
   arg_admin_user=${args[--arg-admin-user]}
   arg_admin_pass=${args[--arg-admin-pass]}
   arg_license_token=${args[--arg-license-token]}
-  arg_log_formatter=${args[--arg-log-formatter]}
 
   ask_user_for_config() {
     local config_done="n"
@@ -3202,22 +3188,37 b' rcstack_init_command() {'
         echo "$(yellow bootstrap_definitions: skipping docker defs creation, existing files found. Use --force to create them anyway)"
         return
     fi
+    definitions_override_decision=true
 
     if [[ -n $DEFINITIONS_EXIST ]]; then
         echo "$(yellow docker definitions exists, are you sure to force re-create them?)"
+        definitions_override_decision=false
         while true; do
           read -p "Would you like to continue with overriding files? [yn] " yn
           case $yn in
-            [Yy]*) break ;;
-            [Nn]*) exit ;;
-            *) echo "Please answer y or n." ;;
-          esac
+              [Yy]*)
+                definitions_override_decision=true
+                break
+                ;;
+              [Nn]*)
+                definitions_override_decision=false
+                break
+                ;;
+              *)
+                echo "Please answer y or n."
+                ;;
+            esac
         done
     fi
 
-    FULL_MODE=1
-    # This expects the $AUTH_TOKEN and $SERVER_URL be present
-    get_docker_definitions $docker_revision $FULL_MODE $DEBUG
+    if [[ "$definitions_override_decision" == true ]]; then
+      FULL_MODE=1
+      # This expects the $AUTH_TOKEN and $SERVER_URL be present
+      get_docker_definitions $docker_revision $FULL_MODE $DEBUG
+    else
+      echo "$(yellow No docker definition override)"
+      # Add commands for cancellation or other actions here.
+    fi
 
   }
 
@@ -7766,7 +7767,7 b' rcstack__completions_parse_requirements() {'
 
 # :command.initialize
 initialize() {
-  version="5.9.0"
+  version="5.10.0"
   long_usage=''
   set -e
 

templates/ini/4.28/rhodecode.ini

@@ -319,7 +319,7 b' file_store.enabled = true'
 file_store.backend = local
 
 ; path to store the uploaded binaries
-file_store.storage_path = %(here)s/data/file_store
+file_store.storage_path = /var/opt/rhodecode_data/file_store
 
 
 ; #############
@@ -328,10 +328,13 b' file_store.storage_path = %(here)s/data/file_store'
 
 ; manually run celery: /path/to/celery worker -E --beat --app rhodecode.lib.celerylib.loader --scheduler rhodecode.lib.celerylib.scheduler.RcScheduler --loglevel DEBUG --ini /path/to/rhodecode.ini
 
-use_celery = false
+use_celery = true
+
+; path to store schedule database
+#celerybeat-schedule.path =
 
 ; connection url to the message broker (default redis)
-celery.broker_url = redis://localhost:6379/8
+celery.broker_url = redis://redis:6379/8
 
 ; rabbitmq example
 #celery.broker_url = amqp://rabbitmq:qweqwe@localhost:5672/rabbitmqhost
@@ -348,7 +351,7 b' celery.task_always_eager = false'
 
 ; Default cache dir for caches. Putting this into a ramdisk can boost performance.
 ; eg. /tmpfs/data_ramdisk, however this directory might require large amount of space
-cache_dir = %(here)s/data
+cache_dir = /var/opt/rhodecode_data
 
 ; *********************************************
 ; `sql_cache_short` cache for heavy SQL queries
@@ -369,9 +372,11 b' rc_cache.cache_repo_longterm.expiration_time = 2592000'
 rc_cache.cache_repo_longterm.max_size = 10000
 
 
-; *************************************************
-; `cache_perms` cache for permission tree, auth TTL
-; *************************************************
+; *********************************************
+; `cache_general` cache for general purpose use
+; for simplicity use rc.file_namespace backend,
+; for performance and scale use rc.redis
+; *********************************************
 rc_cache.cache_perms.backend = dogpile.cache.rc.file_namespace
 rc_cache.cache_perms.expiration_time = 300
 ; file cache store path. Defaults to `cache_dir =` value or tempdir if both values are not set
@@ -420,14 +425,14 b' rc_cache.cache_repo.expiration_time = 2592000'
 ; ##############
 
 ; beaker.session.type is type of storage options for the logged users sessions. Current allowed
-; types are file, ext:redis, ext:database, ext:memcached, and memory (default if not specified).
-; Fastest ones are Redis and ext:database
-beaker.session.type = file
-beaker.session.data_dir = %(here)s/data/sessions
+; types are file, ext:redis, ext:database, ext:memcached
+; Fastest ones are ext:redis and ext:database, DO NOT use memory type for session
+#beaker.session.type = file
+#beaker.session.data_dir = %(here)s/data/sessions
 
 ; Redis based sessions
-#beaker.session.type = ext:redis
-#beaker.session.url = redis://127.0.0.1:6379/2
+beaker.session.type = ext:redis
+beaker.session.url = redis://redis:6379/2
 
 ; DB based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
@@ -439,7 +444,7 b' beaker.session.data_dir = %(here)s/data/sessions'
 
 beaker.session.key = rhodecode
 beaker.session.secret = production-rc-uytcxaz
-beaker.session.lock_dir = %(here)s/data/sessions/lock
+beaker.session.lock_dir = /data_ramdisk/lock
 
 ; Secure encrypted cookie. Requires AES and AES python libraries
 ; you must disable beaker.session.secret to use this
@@ -471,7 +476,7 b' beaker.session.secure = false'
 ; WHOOSH Backend, doesn't require additional services to run
 ; it works good with few dozen repos
 search.module = rhodecode.lib.index.whoosh
-search.location = %(here)s/data/index
+search.location = /var/opt/rhodecode_data/index
 
 ; ElasticSearch (EE edition only). Requires Elastic Search cluster
 ; to be installed, and running. Recommended for large amount of repositories
@@ -487,18 +492,18 b' search.location = %(here)s/data/index'
 ; channelstream enables persistent connections and live notification
 ; in the system. It's also used by the chat system
 
-channelstream.enabled = false
+channelstream.enabled = true
 
 ; server address for channelstream server on the backend
-channelstream.server = 127.0.0.1:9800
+channelstream.server = channelstream:9800
 
 ; location of the channelstream server from outside world
 ; use ws:// for http or wss:// for https. This address needs to be handled
 ; by external HTTP server such as Nginx or Apache
 ; see Nginx/Apache configuration examples in our docs
-channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
-channelstream.secret = secret
-channelstream.history.location = %(here)s/channelstream_history
+channelstream.ws_url = ws://localhost:8888/_channelstream
+channelstream.secret = ENV_GENERATED
+channelstream.history.location = /var/opt/rhodecode_data/channelstream_history
 
 ; Internal application path that Javascript uses to connect into.
 ; If you use proxy-prefix the prefix should be added before /_channelstream
@@ -506,7 +511,7 b' channelstream.proxy_path = /_channelstream'
 
 ; Live chat for commits/pull requests. Requires CHANNELSTREAM to be enabled
 ; and configured. (EE edition only)
-chat.enabled = false
+chat.enabled = true
 
 
 ; ##############################
@@ -546,7 +551,7 b' sqlalchemy.db1.convert_unicode = true'
 ; VCS CONFIG
 ; ##########
 vcs.server.enable = true
-vcs.server = localhost:9900
+vcs.server = vcsserver:10010
 
 ; Web server connectivity protocol, responsible for web based VCS operations
 ; Available protocols are:
@@ -561,9 +566,10 b' vcs.scm_app_implementation = http'
 ; `http` - use http-rpc backend (default)
 vcs.hooks.protocol = http
 
-; Host on which this instance is listening for hooks. If vcsserver is in other location
-; this should be adjusted.
-vcs.hooks.host = 127.0.0.1
+; Host on which this instance is listening for hooks. vcsserver will call this host to pull/push hooks so it should be
+; accessible via network.
+; Use vcs.hooks.host = "*" to bind to current hostname (for Docker)
+vcs.hooks.host = *
 
 ; Start VCSServer with this instance as a subprocess, useful for development
 vcs.start_server = false
@@ -589,13 +595,13 b' vcs.connection_timeout = 3600'
 ; ####################################################
 
 ; Enable or disable the config file generation.
-svn.proxy.generate_config = false
+svn.proxy.generate_config = true
 
 ; Generate config file with `SVNListParentPath` set to `On`.
 svn.proxy.list_parent_path = true
 
 ; Set location and file name of generated config file.
-svn.proxy.config_file_path = %(here)s/mod_dav_svn.conf
+svn.proxy.config_file_path = /etc/rhodecode/conf/svn/mod_dav_svn.conf
 
 ; alternative mod_dav config template. This needs to be a valid mako template
 ; Example template can be found in the source code:
@@ -623,7 +629,7 b' svn.proxy.location_root = /'
 ; any change user ssh keys. Setting this to false also disables possibility
 ; of adding SSH keys by users from web interface. Super admins can still
 ; manage SSH Keys.
-ssh.generate_authorized_keyfile = false
+ssh.generate_authorized_keyfile = true
 
 ; Options for ssh, default is `no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding`
 # ssh.authorized_keys_ssh_opts =
@@ -631,7 +637,7 b' ssh.generate_authorized_keyfile = false'
 ; Path to the authorized_keys file where the generate entries are placed.
 ; It is possible to have multiple key files specified in `sshd_config` e.g.
 ; AuthorizedKeysFile %h/.ssh/authorized_keys %h/.ssh/authorized_keys_rhodecode
-ssh.authorized_keys_file_path = ~/.ssh/authorized_keys_rhodecode
+ssh.authorized_keys_file_path = /etc/rhodecode/conf/ssh/authorized_keys_rhodecode
 
 ; Command to execute the SSH wrapper. The binary is available in the
 ; RhodeCode installation directory.
@@ -656,63 +662,6 b' ssh.executable.svn = ~/.rccontrol/vcsserver-1/profile/bin/svnserve'
 ssh.enable_ui_key_generator = true
 
 
-; #################
-; APPENLIGHT CONFIG
-; #################
-
-; Appenlight is tailored to work with RhodeCode, see
-; http://appenlight.rhodecode.com for details how to obtain an account
-
-; Appenlight integration enabled
-appenlight = false
-
-appenlight.server_url = https://api.appenlight.com
-appenlight.api_key = YOUR_API_KEY
-#appenlight.transport_config = https://api.appenlight.com?threaded=1&timeout=5
-
-; used for JS client
-appenlight.api_public_key = YOUR_API_PUBLIC_KEY
-
-; TWEAK AMOUNT OF INFO SENT HERE
-
-; enables 404 error logging (default False)
-appenlight.report_404 = false
-
-; time in seconds after request is considered being slow (default 1)
-appenlight.slow_request_time = 1
-
-; record slow requests in application
-; (needs to be enabled for slow datastore recording and time tracking)
-appenlight.slow_requests = true
-
-; enable hooking to application loggers
-appenlight.logging = true
-
-; minimum log level for log capture
-appenlight.logging.level = WARNING
-
-; send logs only from erroneous/slow requests
-; (saves API quota for intensive logging)
-appenlight.logging_on_error = false
-
-; list of additional keywords that should be grabbed from environ object
-; can be string with comma separated list of words in lowercase
-; (by default client will always send following info:
-; 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
-; start with HTTP* this list be extended with additional keywords here
-appenlight.environ_keys_whitelist =
-
-; list of keywords that should be blanked from request object
-; can be string with comma separated list of words in lowercase
-; (by default client will always blank keys that contain following words
-; 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
-; this list be extended with additional keywords set here
-appenlight.request_keys_blacklist =
-
-; list of namespaces that should be ignores when gathering log entries
-; can be string with comma separated list of namespaces
-; (by default the client ignores own entries: appenlight_client.client)
-appenlight.log_namespace_blacklist =
 
 ; Dummy marker to add new entries after.
 ; Add any custom entries below. Please don't remove this marker.
@@ -722,6 +671,7 b' custom.conf = 1'
 ; #####################
 ; LOGGING CONFIGURATION
 ; #####################
+
 [loggers]
 keys = root, sqlalchemy, beaker, celery, rhodecode, ssh_wrapper
 

templates/ini/4.28/vcsserver.ini

@@ -115,21 +115,21 b' core.binary_dir = ""'
 
 ; Default cache dir for caches. Putting this into a ramdisk can boost performance.
 ; eg. /tmpfs/data_ramdisk, however this directory might require large amount of space
-cache_dir = %(here)s/data
+cache_dir = /var/opt/rhodecode_data
 
 ; ***************************************
 ; `repo_object` cache, default file based
 ; ***************************************
 
 ; `repo_object` cache settings for vcs methods for repositories
-rc_cache.repo_object.backend = dogpile.cache.rc.file_namespace
+#rc_cache.repo_object.backend = dogpile.cache.rc.file_namespace
 
 ; cache auto-expires after N seconds
 ; Examples: 86400 (1Day), 604800 (7Days), 1209600 (14Days), 2592000 (30days), 7776000 (90Days)
-rc_cache.repo_object.expiration_time = 2592000
+#rc_cache.repo_object.expiration_time = 2592000
 
 ; file cache store path. Defaults to `cache_dir =` value or tempdir if both values are not set
-#rc_cache.repo_object.arguments.filename = /tmp/vcsserver_cache.db
+#rc_cache.repo_object.arguments.filename = /tmp/vcsserver_cache_repo_object.db
 
 ; ***********************************************************
 ; `repo_object` cache with redis backend
@@ -190,7 +190,6 b' handlers ='
 qualname = vcsserver
 propagate = 1
 
-
 ; ########
 ; HANDLERS
 ; ########
@@ -201,7 +200,7 b' args = (sys.stderr, )'
 level = INFO
 ; To enable JSON formatted logs replace 'generic' with 'json'
 ; This allows sending properly formatted logs to grafana loki or elasticsearch
-formatter = json
+formatter = generic
 
 ; ##########
 ; FORMATTERS