Show More
@@ -65,6 +65,8 b' services:' | |||||
65 | - pipcache:/home/rhodecode/.cache/pip |
|
65 | - pipcache:/home/rhodecode/.cache/pip | |
66 | # shared TMP dir |
|
66 | # shared TMP dir | |
67 | - rctmpdir:/tmp |
|
67 | - rctmpdir:/tmp | |
|
68 | # config override | |||
|
69 | - $PWD/service/svn/virtualhost.conf:/home/rhodecode/apache2/conf/virtualhost.conf | |||
68 |
|
70 | |||
69 | sshd: |
|
71 | sshd: | |
70 | volumes: |
|
72 | volumes: |
@@ -79,6 +79,7 b' services:' | |||||
79 |
|
79 | |||
80 | # SVN Specific |
|
80 | # SVN Specific | |
81 | MOD_DAV_SVN_PORT: 8090 |
|
81 | MOD_DAV_SVN_PORT: 8090 | |
|
82 | MOD_DAV_SVN_LOG_LEVEL: info | |||
82 | APACHE_LOG_DIR: /var/log |
|
83 | APACHE_LOG_DIR: /var/log | |
83 | MOD_DAV_SVN_CONF_FILE: /etc/rhodecode/conf/svn/mod_dav_svn.conf |
|
84 | MOD_DAV_SVN_CONF_FILE: /etc/rhodecode/conf/svn/mod_dav_svn.conf | |
84 |
|
85 | |||
@@ -247,10 +248,11 b' services:' | |||||
247 |
|
248 | |||
248 | # SVN Specific |
|
249 | # SVN Specific | |
249 | MOD_DAV_SVN_PORT: 8090 |
|
250 | MOD_DAV_SVN_PORT: 8090 | |
|
251 | MOD_DAV_SVN_LOG_LEVEL: info | |||
250 | APACHE_LOG_DIR: /var/log |
|
252 | APACHE_LOG_DIR: /var/log | |
251 | MOD_DAV_SVN_CONF_FILE: /etc/rhodecode/conf/svn/mod_dav_svn.conf |
|
253 | MOD_DAV_SVN_CONF_FILE: /etc/rhodecode/conf/svn/mod_dav_svn.conf | |
252 |
MOD_DAV_CORE_MODULES_DIR: / |
|
254 | MOD_DAV_CORE_MODULES_DIR: /home/rhodecode/apache2/modules/ | |
253 |
MOD_DAV_SVN_MODULE: / |
|
255 | MOD_DAV_SVN_MODULE: /home/rhodecode/apache2/modules/mod_dav.so | |
254 |
|
256 | |||
255 | healthcheck: |
|
257 | healthcheck: | |
256 | test: curl -A RhodeCode-Healthcheck -s -o /dev/null -w '%{http_code}' http://127.0.0.1:$${MOD_DAV_SVN_PORT}/_server_status |
|
258 | test: curl -A RhodeCode-Healthcheck -s -o /dev/null -w '%{http_code}' http://127.0.0.1:$${MOD_DAV_SVN_PORT}/_server_status |
@@ -44,6 +44,7 b' ENV \\' | |||||
44 | # SVN CONFIG |
|
44 | # SVN CONFIG | |
45 | MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \ |
|
45 | MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \ | |
46 | MOD_DAV_SVN_PORT=8090 \ |
|
46 | MOD_DAV_SVN_PORT=8090 \ | |
|
47 | MOD_DAV_SVN_LOG_LEVEL=info \ | |||
47 | \ |
|
48 | \ | |
48 | # SSHD CONFIG |
|
49 | # SSHD CONFIG | |
49 | SSHD_CONF_FILE=/etc/rhodecode/sshd_config \ |
|
50 | SSHD_CONF_FILE=/etc/rhodecode/sshd_config \ |
@@ -40,6 +40,7 b' ENV \\' | |||||
40 | # SVN CONFIG |
|
40 | # SVN CONFIG | |
41 | MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \ |
|
41 | MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \ | |
42 | MOD_DAV_SVN_PORT=8090 \ |
|
42 | MOD_DAV_SVN_PORT=8090 \ | |
|
43 | MOD_DAV_SVN_LOG_LEVEL=info \ | |||
43 | MOD_DAV_CORE_MODULES_DIR=/home/$RC_USER/apache2/modules \ |
|
44 | MOD_DAV_CORE_MODULES_DIR=/home/$RC_USER/apache2/modules \ | |
44 | MOD_DAV_SVN_MODULE=/home/rhodecode/subversion/libexec/mod_dav_svn.so \ |
|
45 | MOD_DAV_SVN_MODULE=/home/rhodecode/subversion/libexec/mod_dav_svn.so \ | |
45 | \ |
|
46 | \ | |
@@ -249,7 +250,7 b' RUN \\' | |||||
249 |
|
250 | |||
250 | # Apache2 install |
|
251 | # Apache2 install | |
251 | ENV \ |
|
252 | ENV \ | |
252 |
RC_APACHE2_VER=2.4.5 |
|
253 | RC_APACHE2_VER=2.4.58 \ | |
253 | # make apache scripts visible |
|
254 | # make apache scripts visible | |
254 | PATH=/home/$RC_USER/apache2/bin:$PATH |
|
255 | PATH=/home/$RC_USER/apache2/bin:$PATH | |
255 |
|
256 | |||
@@ -273,7 +274,10 b' echo "**** Apache config ****" && \\' | |||||
273 | sed -i "s/#LoadModule dav_module modules\/mod_dav.so/LoadModule dav_module modules\/mod_dav.so/g" /home/$RC_USER/apache2/conf/httpd.conf && \ |
|
274 | sed -i "s/#LoadModule dav_module modules\/mod_dav.so/LoadModule dav_module modules\/mod_dav.so/g" /home/$RC_USER/apache2/conf/httpd.conf && \ | |
274 | sed -i "s/User daemon/User ${RC_USER}/g" /home/$RC_USER/apache2/conf/httpd.conf && \ |
|
275 | sed -i "s/User daemon/User ${RC_USER}/g" /home/$RC_USER/apache2/conf/httpd.conf && \ | |
275 | sed -i "s/Group daemon/Group ${RC_USER}/g" /home/$RC_USER/apache2/conf/httpd.conf && \ |
|
276 | sed -i "s/Group daemon/Group ${RC_USER}/g" /home/$RC_USER/apache2/conf/httpd.conf && \ | |
276 |
sed -i "s/ |
|
277 | sed -i "s/ServerAdmin you@example.com/ServerAdmin admin@${HOSTNAME}/g" /home/$RC_USER/apache2/conf/httpd.conf && \ | |
|
278 | sed -i "s/ServerName buildkitsandbox/ServerName ${HOSTNAME}/g" /home/$RC_USER/apache2/conf/httpd.conf && \ | |||
|
279 | sed -i "s/#Include conf\/extra\/httpd-vhosts.conf/Include conf\/virtualhost.conf/g" /home/$RC_USER/apache2/conf/httpd.conf | |||
|
280 | ||||
277 |
|
281 | |||
278 | # Subversion install |
|
282 | # Subversion install | |
279 | # https://svn.apache.org/repos/asf/subversion/trunk/subversion/bindings/swig/INSTALL |
|
283 | # https://svn.apache.org/repos/asf/subversion/trunk/subversion/bindings/swig/INSTALL |
@@ -44,6 +44,7 b' ENV \\' | |||||
44 | # SVN CONFIG |
|
44 | # SVN CONFIG | |
45 | MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \ |
|
45 | MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \ | |
46 | MOD_DAV_SVN_PORT=8090 \ |
|
46 | MOD_DAV_SVN_PORT=8090 \ | |
|
47 | MOD_DAV_SVN_LOG_LEVEL=info \ | |||
47 | MOD_DAV_CORE_MODULES_DIR=/usr/lib/apache2/modules \ |
|
48 | MOD_DAV_CORE_MODULES_DIR=/usr/lib/apache2/modules \ | |
48 | MOD_DAV_SVN_MODULE=/usr/lib/apache2/modules/mod_dav_svn.so \ |
|
49 | MOD_DAV_SVN_MODULE=/usr/lib/apache2/modules/mod_dav_svn.so \ | |
49 | \ |
|
50 | \ |
@@ -7,7 +7,8 b' ENV \\' | |||||
7 | RC_USER=rhodecode \ |
|
7 | RC_USER=rhodecode \ | |
8 | # SVN CONFIG |
|
8 | # SVN CONFIG | |
9 | MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \ |
|
9 | MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \ | |
10 | MOD_DAV_SVN_PORT=8090 |
|
10 | MOD_DAV_SVN_PORT=8090 \ | |
|
11 | MOD_DAV_SVN_LOG_LEVEL=info | |||
11 |
|
12 | |||
12 | ENV SVN_LOCALE_DEPS apache2 apache2-utils libapache2-mod-svn subversion |
|
13 | ENV SVN_LOCALE_DEPS apache2 apache2-utils libapache2-mod-svn subversion | |
13 | #apache2-webdav |
|
14 | #apache2-webdav |
@@ -6,9 +6,9 b' LoadModule dav_svn_module ${MOD_DAV_SVN_MODULE}' | |||||
6 | ErrorLogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"function\" : \"[%-m:%l]\" , \"process\" : \"[pid %P:tid %T]\" , \"message\" : \"%M\" ,\ \"referer\"\ : \"%{Referer}i\" }" |
|
6 | ErrorLogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"function\" : \"[%-m:%l]\" , \"process\" : \"[pid %P:tid %T]\" , \"message\" : \"%M\" ,\ \"referer\"\ : \"%{Referer}i\" }" | |
7 | LogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"process\":\"%D\", \"filename\":\"%f\", \"remoteIP\":\"%a\", \"host\":\"%V\", \"request\":\"%U\", \"query\":\"%q\", \"method\":\"%m\", \"status\":\"%>s\", \"userAgent\":\"%{User-agent}i\", \"referer\":\"%{Referer}i\" }" combined |
|
7 | LogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"process\":\"%D\", \"filename\":\"%f\", \"remoteIP\":\"%a\", \"host\":\"%V\", \"request\":\"%U\", \"query\":\"%q\", \"method\":\"%m\", \"status\":\"%>s\", \"userAgent\":\"%{User-agent}i\", \"referer\":\"%{Referer}i\" }" combined | |
8 |
|
8 | |||
9 | ErrorLog /dev/stderr |
|
9 | ErrorLog /proc/self/fd/2 | |
10 | TransferLog /dev/stdout |
|
10 | CustomLog /proc/self/fd/1 combined | |
11 | CustomLog /dev/stdout combined |
|
11 | LogLevel ${MOD_DAV_SVN_LOG_LEVEL} | |
12 |
|
12 | |||
13 | <VirtualHost *:${MOD_DAV_SVN_PORT}> |
|
13 | <VirtualHost *:${MOD_DAV_SVN_PORT}> | |
14 | ServerAdmin admin@localhost |
|
14 | ServerAdmin admin@localhost | |
@@ -17,10 +17,6 b' CustomLog /dev/stdout combined' | |||||
17 | ErrorLogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"function\" : \"[%-m:%l]\" , \"process\" : \"[pid %P:tid %T]\" , \"message\" : \"%M\" ,\ \"referer\"\ : \"%{Referer}i\" }" |
|
17 | ErrorLogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"function\" : \"[%-m:%l]\" , \"process\" : \"[pid %P:tid %T]\" , \"message\" : \"%M\" ,\ \"referer\"\ : \"%{Referer}i\" }" | |
18 | LogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"process\":\"%D\", \"filename\":\"%f\", \"remoteIP\":\"%a\", \"host\":\"%V\", \"request\":\"%U\", \"query\":\"%q\", \"method\":\"%m\", \"status\":\"%>s\", \"userAgent\":\"%{User-agent}i\", \"referer\":\"%{Referer}i\" }" combined |
|
18 | LogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"process\":\"%D\", \"filename\":\"%f\", \"remoteIP\":\"%a\", \"host\":\"%V\", \"request\":\"%U\", \"query\":\"%q\", \"method\":\"%m\", \"status\":\"%>s\", \"userAgent\":\"%{User-agent}i\", \"referer\":\"%{Referer}i\" }" combined | |
19 |
|
19 | |||
20 | ErrorLog /dev/stderr |
|
|||
21 | CustomLog /dev/stdout combined |
|
|||
22 | LogLevel info |
|
|||
23 |
|
||||
24 | <Location /_server_status> |
|
20 | <Location /_server_status> | |
25 | Require ip 127 |
|
21 | Require ip 127 | |
26 | SetHandler server-status |
|
22 | SetHandler server-status |
General Comments 0
You need to be logged in to leave comments.
Login now