diff --git a/configs/production.ini b/configs/production.ini --- a/configs/production.ini +++ b/configs/production.ini @@ -255,7 +255,7 @@ file_store.enabled = true ; Storage backend, available options are: local file_store.backend = local -; path to store the uploaded binaries +; path to store the uploaded binaries and artifacts file_store.storage_path = /var/opt/rhodecode_data/file_store ; Uncomment and set this path to control settings for archive download cache. diff --git a/rhodecode/tests/conftest_common.py b/rhodecode/tests/conftest_common.py --- a/rhodecode/tests/conftest_common.py +++ b/rhodecode/tests/conftest_common.py @@ -82,10 +82,11 @@ def pytest_addoption(parser): parser.addoption( '--test-loglevel', dest='test_loglevel', help="Set default Logging level for tests, critical(default), error, warn , info, debug") - group = parser.getgroup('pylons') + + group = parser.getgroup('pyramid') group.addoption( - '--with-pylons', dest='pyramid_config', - help="Set up a Pylons environment with the specified config file.") + '--pyramid-config', dest='pyramid_config', + help="Set up a pyramid with the specified ini config file.") group.addoption( '--ini-config-override', action='store', type=_parse_json, default=None, dest='pyramid_config_override', help=( diff --git a/rhodecode/tests/rhodecode.ini b/rhodecode/tests/rhodecode.ini --- a/rhodecode/tests/rhodecode.ini +++ b/rhodecode/tests/rhodecode.ini @@ -104,6 +104,12 @@ startup.import_repos = true ; SSH calls. Set this for events to receive proper url for SSH calls. app.base_url = http://rhodecode.local +; Host at which the Service API is running. +app.service_api.host = http://rhodecode.local:10020 + +; Secret for Service API authentication. +app.service_api.token = + ; Unique application ID. Should be a random unique string for security. app_instance_uuid = rc-production @@ -206,6 +212,9 @@ auth_ret_code_detection = false ; codes don't break the transactions while 4XX codes do lock_ret_code = 423 +; Filesystem location were repositories should be stored +repo_store.path = /var/opt/rhodecode_repo_store + ; allows to setup custom hooks in settings page allow_custom_hooks_settings = true @@ -246,8 +255,8 @@ file_store.enabled = true ; Storage backend, available options are: local file_store.backend = local -; path to store the uploaded binaries -file_store.storage_path = %(here)s/data/file_store +; path to store the uploaded binaries and artifacts +file_store.storage_path = /var/opt/rhodecode_data/file_store ; Uncomment and set this path to control settings for archive download cache. ; Generated repo archives will be cached at this location @@ -256,7 +265,7 @@ file_store.storage_path = %(here)s/data/ ; RhodeCode and vcsserver ; Default is $cache_dir/archive_cache if not set -archive_cache.store_dir = /tmp/rc-test-data/archive_cache +archive_cache.store_dir = /var/opt/rhodecode_data/tarballcache ; The limit in GB sets how much data we cache before recycling last used, defaults to 10 gb archive_cache.cache_size_gb = 10 @@ -276,7 +285,10 @@ use_celery = false #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 + +; results backend to get results for (default redis) +celery.result_backend = redis://redis:6379/8 ; rabbitmq example #celery.broker_url = amqp://rabbitmq:qweqwe@localhost:5672/rabbitmqhost @@ -285,7 +297,8 @@ celery.broker_url = redis://localhost:63 celery.max_tasks_per_child = 20 ; tasks will never be sent to the queue, but executed locally instead. -celery.task_always_eager = false +celery.task_always_eager = true +celery.task_store_eager_result = true ; ############# ; DOGPILE CACHE @@ -293,7 +306,7 @@ 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/rc-test-data +cache_dir = /var/opt/rhodecode_data ; ********************************************* ; `sql_cache_short` cache for heavy SQL queries @@ -400,14 +413,14 @@ rc_cache.cache_repo.arguments.filename = ; ############## ; 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 +; 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/rc-tests/data/sessions ; Redis based sessions #beaker.session.type = ext:redis -#beaker.session.url = redis://127.0.0.1:6379/2 +#beaker.session.url = redis://redis:6379/2 ; DB based session, fast, and allows easy management over logged in users #beaker.session.type = ext:database @@ -437,9 +450,6 @@ beaker.session.httponly = true ; Set https secure cookie beaker.session.secure = false -## auto save the session to not to use .save() -beaker.session.auto = false - ; default cookie expiration time in seconds, set to `true` to set expire ; at browser close #beaker.session.cookie_expires = 3600 @@ -552,11 +562,6 @@ vcs.backends = hg, git, svn ; Wait this number of seconds before killing connection to the vcsserver vcs.connection_timeout = 3600 -; Compatibility version when creating SVN repositories. Defaults to newest version when commented out. -; Set a numeric version for your current SVN e.g 1.8, or 1.12 -; Legacy available options are: pre-1.4-compatible, pre-1.5-compatible, pre-1.6-compatible, pre-1.8-compatible, pre-1.9-compatible -#vcs.svn.compatible_version = 1.8 - ; Cache flag to cache vcsserver remote calls locally ; It uses cache_region `cache_repo` vcs.methods.cache = false @@ -566,6 +571,17 @@ vcs.methods.cache = false ; Maps RhodeCode repo groups into SVN paths for Apache ; #################################################### +; Compatibility version when creating SVN repositories. Defaults to newest version when commented out. +; Set a numeric version for your current SVN e.g 1.8, or 1.12 +; Legacy available options are: pre-1.4-compatible, pre-1.5-compatible, pre-1.6-compatible, pre-1.8-compatible, pre-1.9-compatible +#vcs.svn.compatible_version = 1.8 + +; Enable SVN proxy of requests over HTTP +vcs.svn.proxy.enabled = true + +; host to connect to running SVN subsystem +vcs.svn.proxy.host = http://svn:8090 + ; Enable or disable the config file generation. svn.proxy.generate_config = false @@ -613,8 +629,8 @@ ssh.authorized_keys_file_path = %(here)s ; Command to execute the SSH wrapper. The binary is available in the ; RhodeCode installation directory. -; e.g ~/.rccontrol/community-1/profile/bin/rc-ssh-wrapper -ssh.wrapper_cmd = ~/.rccontrol/community-1/rc-ssh-wrapper +; e.g /usr/local/bin/rhodecode_bin/bin/rc-ssh-wrapper +ssh.wrapper_cmd = /usr/local/bin/rhodecode_bin/bin/rc-ssh-wrapper ; Allow shell when executing the ssh-wrapper command ssh.wrapper_cmd_allow_shell = false @@ -625,9 +641,9 @@ ssh.enable_debug_logging = false ; Paths to binary executable, by default they are the names, but we can ; override them if we want to use a custom one -ssh.executable.hg = ~/.rccontrol/vcsserver-1/profile/bin/hg -ssh.executable.git = ~/.rccontrol/vcsserver-1/profile/bin/git -ssh.executable.svn = ~/.rccontrol/vcsserver-1/profile/bin/svnserve +ssh.executable.hg = /usr/local/bin/rhodecode_bin/vcs_bin/hg +ssh.executable.git = /usr/local/bin/rhodecode_bin/vcs_bin/git +ssh.executable.svn = /usr/local/bin/rhodecode_bin/vcs_bin/svnserve ; Enables SSH key generator web interface. Disabling this still allows users ; to add their own keys.