##// END OF EJS Templates
rhodecode-vcsserver
RSS
release: Merge default into stable for release preparation
marcink -
r53:92a4cc66 merge stable
parent child Browse files
Show More
Show file before | Show file after | Hide comments
1 NO CONTENT: new file 100644
NO CONTENT: new file 100644
Show file before | Show file after | Hide comments
@@ -0,0 +1,15 b''
1 # top level files
2 include test.ini
3 include MANIFEST.in
4 include README.rst
5 include CHANGES.rst
6 include LICENSE.txt
7
8 include vcsserver/VERSION
9
10 # all config files
11 recursive-include configs *
12
13 # skip any tests files
14 recursive-exclude tests *
15
Show file before | Show file after | Hide comments
@@ -0,0 +1,111 b''
1 ################################################################################
2 # RhodeCode VCSServer with HTTP Backend - configuration #
3 # #
4 ################################################################################
5
6 [app:main]
7 use = egg:rhodecode-vcsserver
8
9 pyramid.default_locale_name = en
10 pyramid.includes =
11
12 # default locale used by VCS systems
13 locale = en_US.UTF-8
14
15 # cache regions, please don't change
16 beaker.cache.regions = repo_object
17 beaker.cache.repo_object.type = memorylru
18 beaker.cache.repo_object.max_items = 100
19 # cache auto-expires after N seconds
20 beaker.cache.repo_object.expire = 300
21 beaker.cache.repo_object.enabled = true
22
23 [server:main]
24 ## COMMON ##
25 host = 127.0.0.1
26 port = 9900
27
28
29 ##########################
30 ## GUNICORN WSGI SERVER ##
31 ##########################
32 ## run with gunicorn --log-config <inifile.ini> --paste <inifile.ini>
33 use = egg:gunicorn#main
34 ## Sets the number of process workers. You must set `instance_id = *`
35 ## when this option is set to more than one worker, recommended
36 ## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
37 ## The `instance_id = *` must be set in the [app:main] section below
38 workers = 2
39 ## process name
40 proc_name = rhodecode_vcsserver
41 ## type of worker class, one of sync, gevent
42 ## recommended for bigger setup is using of of other than sync one
43 worker_class = sync
44 ## The maximum number of simultaneous clients. Valid only for Gevent
45 #worker_connections = 10
46 ## max number of requests that worker will handle before being gracefully
47 ## restarted, could prevent memory leaks
48 max_requests = 1000
49 max_requests_jitter = 30
50 ## amount of time a worker can spend with handling a request before it
51 ## gets killed and restarted. Set to 6hrs
52 timeout = 21600
53
54
55
56
57 ################################
58 ### LOGGING CONFIGURATION ####
59 ################################
60 [loggers]
61 keys = root, vcsserver, pyro4, beaker
62
63 [handlers]
64 keys = console
65
66 [formatters]
67 keys = generic
68
69 #############
70 ## LOGGERS ##
71 #############
72 [logger_root]
73 level = NOTSET
74 handlers = console
75
76 [logger_vcsserver]
77 level = DEBUG
78 handlers =
79 qualname = vcsserver
80 propagate = 1
81
82 [logger_beaker]
83 level = DEBUG
84 handlers =
85 qualname = beaker
86 propagate = 1
87
88 [logger_pyro4]
89 level = DEBUG
90 handlers =
91 qualname = Pyro4
92 propagate = 1
93
94
95 ##############
96 ## HANDLERS ##
97 ##############
98
99 [handler_console]
100 class = StreamHandler
101 args = (sys.stderr,)
102 level = DEBUG
103 formatter = generic
104
105 ################
106 ## FORMATTERS ##
107 ################
108
109 [formatter_generic]
110 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
111 datefmt = %Y-%m-%d %H:%M:%S No newline at end of file
Show file before | Show file after | Hide comments
@@ -1,5 +1,5 b''
1 [bumpversion]
1 [bumpversion]
2 current_version = 4.2.1
2 current_version = 4.3.0
3 message = release: Bump version {current_version} to {new_version}
3 message = release: Bump version {current_version} to {new_version}
4
4
5 [bumpversion:file:vcsserver/VERSION]
5 [bumpversion:file:vcsserver/VERSION]
Show file before | Show file after | Hide comments
@@ -5,12 +5,10 b' done = false'
5 done = true
5 done = true
6
6
7 [task:fixes_on_stable]
7 [task:fixes_on_stable]
8 done = true
9
8
10 [task:pip2nix_generated]
9 [task:pip2nix_generated]
11 done = true
12
10
13 [release]
11 [release]
14 state = prepared
12 state = in_progress
15 version = 4.2.1
13 version = 4.3.0
16
14
Show file before | Show file after | Hide comments
@@ -1,79 +1,1 b''
1 ################################################################################
1 development_http.ini No newline at end of file
2 # RhodeCode VCSServer - configuration #
3 # #
4 ################################################################################
5
6 [DEFAULT]
7 host = 127.0.0.1
8 port = 9900
9 locale = en_US.UTF-8
10 # number of worker threads, this should be set based on a formula threadpool=N*6
11 # where N is number of RhodeCode Enterprise workers, eg. running 2 instances
12 # 8 gunicorn workers each would be 2 * 8 * 6 = 96, threadpool_size = 96
13 threadpool_size = 96
14 timeout = 0
15
16 # cache regions, please don't change
17 beaker.cache.regions = repo_object
18 beaker.cache.repo_object.type = memorylru
19 beaker.cache.repo_object.max_items = 100
20 # cache auto-expires after N seconds
21 beaker.cache.repo_object.expire = 300
22 beaker.cache.repo_object.enabled = true
23
24
25 ################################
26 ### LOGGING CONFIGURATION ####
27 ################################
28 [loggers]
29 keys = root, vcsserver, pyro4, beaker
30
31 [handlers]
32 keys = console
33
34 [formatters]
35 keys = generic
36
37 #############
38 ## LOGGERS ##
39 #############
40 [logger_root]
41 level = NOTSET
42 handlers = console
43
44 [logger_vcsserver]
45 level = DEBUG
46 handlers =
47 qualname = vcsserver
48 propagate = 1
49
50 [logger_beaker]
51 level = DEBUG
52 handlers =
53 qualname = beaker
54 propagate = 1
55
56 [logger_pyro4]
57 level = DEBUG
58 handlers =
59 qualname = Pyro4
60 propagate = 1
61
62
63 ##############
64 ## HANDLERS ##
65 ##############
66
67 [handler_console]
68 class = StreamHandler
69 args = (sys.stderr,)
70 level = DEBUG
71 formatter = generic
72
73 ################
74 ## FORMATTERS ##
75 ################
76
77 [formatter_generic]
78 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
79 datefmt = %Y-%m-%d %H:%M:%S
Show file before | Show file after | Hide comments
@@ -1,5 +1,5 b''
1 ################################################################################
1 ################################################################################
2 # RhodeCode VCSServer - configuration #
2 # RhodeCode VCSServer with HTTP Backend - configuration #
3 # #
3 # #
4 ################################################################################
4 ################################################################################
5
5
@@ -9,6 +9,7 b' use = egg:rhodecode-vcsserver'
9 pyramid.default_locale_name = en
9 pyramid.default_locale_name = en
10 pyramid.includes =
10 pyramid.includes =
11
11
12 # default locale used by VCS systems
12 locale = en_US.UTF-8
13 locale = en_US.UTF-8
13
14
14 # cache regions, please don't change
15 # cache regions, please don't change
@@ -20,9 +21,11 b' beaker.cache.repo_object.expire = 300'
20 beaker.cache.repo_object.enabled = true
21 beaker.cache.repo_object.enabled = true
21
22
22 [server:main]
23 [server:main]
23 use = egg:waitress#main
24 ## COMMON ##
24 host = 0.0.0.0
25 host = 0.0.0.0
25 port = %(http_port)s
26 port = 9900
27
28 use = egg:waitress#main
26
29
27
30
28 ################################
31 ################################
Show file before | Show file after | Hide comments
1 NO CONTENT: file copied from configs/development.ini to configs/development_pyro4.ini
NO CONTENT: file copied from configs/development.ini to configs/development_pyro4.ini
Show file before | Show file after | Hide comments
@@ -1,79 +1,1 b''
1 ################################################################################
1 production_http.ini No newline at end of file
2 # RhodeCode VCSServer - configuration #
3 # #
4 ################################################################################
5
6 [DEFAULT]
7 host = 127.0.0.1
8 port = 9900
9 locale = en_US.UTF-8
10 # number of worker threads, this should be set based on a formula threadpool=N*6
11 # where N is number of RhodeCode Enterprise workers, eg. running 2 instances
12 # 8 gunicorn workers each would be 2 * 8 * 6 = 96, threadpool_size = 96
13 threadpool_size = 96
14 timeout = 0
15
16 # cache regions, please don't change
17 beaker.cache.regions = repo_object
18 beaker.cache.repo_object.type = memorylru
19 beaker.cache.repo_object.max_items = 100
20 # cache auto-expires after N seconds
21 beaker.cache.repo_object.expire = 300
22 beaker.cache.repo_object.enabled = true
23
24
25 ################################
26 ### LOGGING CONFIGURATION ####
27 ################################
28 [loggers]
29 keys = root, vcsserver, pyro4, beaker
30
31 [handlers]
32 keys = console
33
34 [formatters]
35 keys = generic
36
37 #############
38 ## LOGGERS ##
39 #############
40 [logger_root]
41 level = NOTSET
42 handlers = console
43
44 [logger_vcsserver]
45 level = DEBUG
46 handlers =
47 qualname = vcsserver
48 propagate = 1
49
50 [logger_beaker]
51 level = DEBUG
52 handlers =
53 qualname = beaker
54 propagate = 1
55
56 [logger_pyro4]
57 level = DEBUG
58 handlers =
59 qualname = Pyro4
60 propagate = 1
61
62
63 ##############
64 ## HANDLERS ##
65 ##############
66
67 [handler_console]
68 class = StreamHandler
69 args = (sys.stderr,)
70 level = DEBUG
71 formatter = generic
72
73 ################
74 ## FORMATTERS ##
75 ################
76
77 [formatter_generic]
78 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
79 datefmt = %Y-%m-%d %H:%M:%S
Show file before | Show file after | Hide comments
1 NO CONTENT: file copied from configs/production.ini to configs/production_pyro4.ini
NO CONTENT: file copied from configs/production.ini to configs/production_pyro4.ini
Show file before | Show file after | Hide comments
@@ -182,13 +182,13 b''
182 };
182 };
183 };
183 };
184 mercurial = super.buildPythonPackage {
184 mercurial = super.buildPythonPackage {
185 name = "mercurial-3.8.3";
185 name = "mercurial-3.8.4";
186 buildInputs = with self; [];
186 buildInputs = with self; [];
187 doCheck = false;
187 doCheck = false;
188 propagatedBuildInputs = with self; [];
188 propagatedBuildInputs = with self; [];
189 src = fetchurl {
189 src = fetchurl {
190 url = "https://pypi.python.org/packages/56/bc/af1561195d43638d44bc3ac286c21f187430966234bee1f235711d80dfb6/mercurial-3.8.3.tar.gz";
190 url = "https://pypi.python.org/packages/bc/16/b66eef0b70ee2b4ebb8e76622fe21bbed834606dd8c1bd30d6936ebf6f45/mercurial-3.8.4.tar.gz";
191 md5 = "97aced7018614eeccc9621a3dea35fda";
191 md5 = "cec2c3db688cb87142809089c6ae13e9";
192 };
192 };
193 meta = {
193 meta = {
194 license = [ pkgs.lib.licenses.gpl1 pkgs.lib.licenses.gpl2Plus ];
194 license = [ pkgs.lib.licenses.gpl1 pkgs.lib.licenses.gpl2Plus ];
@@ -299,7 +299,7 b''
299 };
299 };
300 };
300 };
301 rhodecode-vcsserver = super.buildPythonPackage {
301 rhodecode-vcsserver = super.buildPythonPackage {
302 name = "rhodecode-vcsserver-4.2.1";
302 name = "rhodecode-vcsserver-4.3.0";
303 buildInputs = with self; [mock pytest WebTest];
303 buildInputs = with self; [mock pytest WebTest];
304 doCheck = true;
304 doCheck = true;
305 propagatedBuildInputs = with self; [configobj dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid Pyro4 simplejson subprocess32 waitress WebOb];
305 propagatedBuildInputs = with self; [configobj dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid Pyro4 simplejson subprocess32 waitress WebOb];
Show file before | Show file after | Hide comments
@@ -3,7 +3,7 b' configobj==5.0.6'
3 dulwich==0.13.0
3 dulwich==0.13.0
4 hgsubversion==1.8.6
4 hgsubversion==1.8.6
5 infrae.cache==1.0.1
5 infrae.cache==1.0.1
6 mercurial==3.8.3
6 mercurial==3.8.4
7 msgpack-python==0.4.6
7 msgpack-python==0.4.6
8 py==1.4.29
8 py==1.4.29
9 pyramid==1.6.1
9 pyramid==1.6.1
Show file before | Show file after | Hide comments
@@ -1,1 +1,1 b''
1 4.2.1 No newline at end of file
1 4.3.0 No newline at end of file
General Comments 0
You need to be logged in to leave comments. Login now