rccontrol: use standard names for .ini files

README.md

@@ -372,7 +372,7 b' docker run \\'
   --publish 10020:10020 \
   --restart unless-stopped \
   --volume $PWD/config:/etc/rhodecode/conf \
-  --volume $PWD/config/rhodecode.optimized.ini:/etc/rhodecode/conf_build/run.ini \
+  --volume $PWD/config/rhodecode.ini:/etc/rhodecode/conf_build/rhodecode.ini \
   --volume $PWD/logs:/var/log/rhodecode \
   'rhodecode/rhodecode-ee:4.23.2'
 ```

docker-compose-apps.yaml

@@ -28,7 +28,7 b' services:'
       "/usr/local/bin/rhodecode_bin/bin/gunicorn",
       "--name=gunicorn-rhodecode-1",
       "--error-logfile=-",
-      "--paster=/etc/rhodecode/conf/rhodecode.optimized.ini",
+      "--paster=/etc/rhodecode/conf/rhodecode.ini",
       "--config=/etc/rhodecode/conf/gunicorn_conf_rc.py"
     ]
     deploy:
@@ -61,7 +61,7 b' services:'
       SETUP_APP: 1 # run the application default settings setup, can be turned off after initial run
       #FORCE_DB_INIT_FILE: 1 # force the database init, warning: destroys old DB
       #FORCE_RC_SETUP_APP: 1 # force running setup scripts for configuration/license application
-      MAIN_INI_PATH: /etc/rhodecode/conf/rhodecode.optimized.ini
+      MAIN_INI_PATH: /etc/rhodecode/conf/rhodecode.ini
 
       # SVN Specific
       MOD_DAV_SVN_PORT: 8090
@@ -120,7 +120,7 b' services:'
        "/home/rhodecode/.rccontrol/vcsserver-1/profile/bin/gunicorn",
        "--name=gunicorn-vcsserver-1",
        "--error-logfile=-",
-       "--paster=/etc/rhodecode/conf/vcsserver.optimized.ini",
+       "--paster=/etc/rhodecode/conf/vcsserver.ini",
        "--config=/etc/rhodecode/conf/gunicorn_conf_vcs.py"
     ]
     deploy:
@@ -139,7 +139,7 b' services:'
     environment:
       RC_APP_TYPE: rhodecode_vcsserver
       RC_APP_PROC: 1
-      MAIN_INI_PATH: /etc/rhodecode/conf/vcsserver.optimized.ini
+      MAIN_INI_PATH: /etc/rhodecode/conf/vcsserver.ini
       SSL_CERT_FILE: "/etc/rhodecode/conf/ca-bundle.crt"
       REQUESTS_CA_BUNDLE: "/etc/rhodecode/conf/ca-bundle.crt"
       GIT_SSL_CAINFO: "/etc/rhodecode/conf/ca-bundle.crt"
@@ -176,13 +176,13 b' services:'
         "--no-color",
         "--app=rhodecode.lib.celerylib.loader",
         "--loglevel=DEBUG",
-        "--ini=/etc/rhodecode/conf/rhodecode.optimized.ini"
+        "--ini=/etc/rhodecode/conf/rhodecode.ini"
     ]
 
     environment:
       RC_APP_TYPE: rhodecode_celery
       RC_APP_PROC: 1
-      MAIN_INI_PATH: /etc/rhodecode/conf/rhodecode.optimized.ini
+      MAIN_INI_PATH: /etc/rhodecode/conf/rhodecode.ini
       SSL_CERT_FILE: "/etc/rhodecode/conf/ca-bundle.crt"
       REQUESTS_CA_BUNDLE: "/etc/rhodecode/conf/ca-bundle.crt"
       GIT_SSL_CAINFO: "/etc/rhodecode/conf/ca-bundle.crt"
@@ -223,13 +223,13 b' services:'
       "--app=rhodecode.lib.celerylib.loader",
       "--scheduler=rhodecode.lib.celerylib.scheduler.RcScheduler",
       "--loglevel=DEBUG",
-      "--ini=/etc/rhodecode/conf/rhodecode.optimized.ini"
+      "--ini=/etc/rhodecode/conf/rhodecode.ini"
     ]
 
     environment:
       RC_APP_TYPE: rhodecode_beat
       RC_APP_PROC: 1
-      MAIN_INI_PATH: /etc/rhodecode/conf/rhodecode.optimized.ini
+      MAIN_INI_PATH: /etc/rhodecode/conf/rhodecode.ini
       SSL_CERT_FILE: "/etc/rhodecode/conf/ca-bundle.crt"
       REQUESTS_CA_BUNDLE: "/etc/rhodecode/conf/ca-bundle.crt"
       GIT_SSL_CAINFO: "/etc/rhodecode/conf/ca-bundle.crt"

scripts/rccontrol/rccontrol

@@ -2158,10 +2158,10 b' rccontrol_cli_db_upgrade_command() {'
   fi
 
   if [[ $DEBUG ]]; then
-    echo "./rccontrol stack rhodecode exec rhodecode /usr/local/bin/rhodecode_bin/bin/rc-upgrade-db /etc/rhodecode/conf/rhodecode.optimized.ini --force-yes"
+    echo "./rccontrol stack rhodecode exec rhodecode /usr/local/bin/rhodecode_bin/bin/rc-upgrade-db /etc/rhodecode/conf/rhodecode.ini --force-yes"
   fi
 
-  ./rccontrol stack rhodecode exec rhodecode /usr/local/bin/rhodecode_bin/bin/rc-upgrade-db /etc/rhodecode/conf/rhodecode.optimized.ini --force-yes
+  ./rccontrol stack rhodecode exec rhodecode /usr/local/bin/rhodecode_bin/bin/rc-upgrade-db /etc/rhodecode/conf/rhodecode.ini --force-yes
 }
 
 # :command.function