docker: fix SVN paths and expose option to change log-level

docker-compose-apps.dev.yaml

@@ -65,6 +65,8 b' services:'
       - pipcache:/home/rhodecode/.cache/pip
       # shared TMP dir
       - rctmpdir:/tmp
+      # config override
+      - $PWD/service/svn/virtualhost.conf:/home/rhodecode/apache2/conf/virtualhost.conf
 
   sshd:
     volumes:

docker-compose-apps.yaml

@@ -79,6 +79,7 b' services:'
 
       # SVN Specific
       MOD_DAV_SVN_PORT: 8090
+      MOD_DAV_SVN_LOG_LEVEL: info
       APACHE_LOG_DIR: /var/log
       MOD_DAV_SVN_CONF_FILE: /etc/rhodecode/conf/svn/mod_dav_svn.conf
 
@@ -247,10 +248,11 b' services:'
 
       # SVN Specific
       MOD_DAV_SVN_PORT: 8090
+      MOD_DAV_SVN_LOG_LEVEL: info
       APACHE_LOG_DIR: /var/log
       MOD_DAV_SVN_CONF_FILE: /etc/rhodecode/conf/svn/mod_dav_svn.conf
-      MOD_DAV_CORE_MODULES_DIR: /usr/lib/apache2/modules
-      MOD_DAV_SVN_MODULE: /usr/lib/apache2/modules/mod_dav_svn.so
+      MOD_DAV_CORE_MODULES_DIR: /home/rhodecode/apache2/modules/
+      MOD_DAV_SVN_MODULE: /home/rhodecode/apache2/modules/mod_dav.so
 
     healthcheck:
       test: curl -A RhodeCode-Healthcheck -s -o /dev/null -w '%{http_code}' http://127.0.0.1:$${MOD_DAV_SVN_PORT}/_server_status

service/rhodecode/rhodecode.dockerfile

@@ -44,6 +44,7 b' ENV \\'
     # SVN CONFIG
     MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \
     MOD_DAV_SVN_PORT=8090 \
+    MOD_DAV_SVN_LOG_LEVEL=info \
     \
     # SSHD CONFIG
     SSHD_CONF_FILE=/etc/rhodecode/sshd_config \

service/rhodecode/rhodecode_5.dockerfile

@@ -40,6 +40,7 b' ENV \\'
     # SVN CONFIG
     MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \
     MOD_DAV_SVN_PORT=8090 \
+    MOD_DAV_SVN_LOG_LEVEL=info \
     MOD_DAV_CORE_MODULES_DIR=/home/$RC_USER/apache2/modules \
     MOD_DAV_SVN_MODULE=/home/rhodecode/subversion/libexec/mod_dav_svn.so \
     \
@@ -249,7 +250,7 b' RUN \\'
 
 # Apache2 install
 ENV \
-    RC_APACHE2_VER=2.4.57 \
+    RC_APACHE2_VER=2.4.58 \
     # make apache scripts visible
     PATH=/home/$RC_USER/apache2/bin:$PATH
 
@@ -273,7 +274,10 b' echo "**** Apache config ****" && \\'
     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 && \
     sed -i "s/User daemon/User ${RC_USER}/g" /home/$RC_USER/apache2/conf/httpd.conf && \
     sed -i "s/Group daemon/Group ${RC_USER}/g" /home/$RC_USER/apache2/conf/httpd.conf && \
-    sed -i "s/#ServerName www.example.com:80/ServerName ${HOSTNAME}/g" /home/$RC_USER/apache2/conf/httpd.conf
+    sed -i "s/ServerAdmin [e-mail]/ServerAdmin admin@${HOSTNAME}/g" /home/$RC_USER/apache2/conf/httpd.conf && \
+    sed -i "s/ServerName buildkitsandbox/ServerName ${HOSTNAME}/g" /home/$RC_USER/apache2/conf/httpd.conf && \
+    sed -i "s/#Include conf\/extra\/httpd-vhosts.conf/Include conf\/virtualhost.conf/g" /home/$RC_USER/apache2/conf/httpd.conf
+
 
 # Subversion install
 # https://svn.apache.org/repos/asf/subversion/trunk/subversion/bindings/swig/INSTALL

service/rhodecode/rhodecode_source.dockerfile

@@ -44,6 +44,7 b' ENV \\'
     # SVN CONFIG
     MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \
     MOD_DAV_SVN_PORT=8090 \
+    MOD_DAV_SVN_LOG_LEVEL=info \
     MOD_DAV_CORE_MODULES_DIR=/usr/lib/apache2/modules \
     MOD_DAV_SVN_MODULE=/usr/lib/apache2/modules/mod_dav_svn.so \
     \

service/svn/rhodecode_svn.dockerfile

@@ -7,7 +7,8 b' ENV \\'
     RC_USER=rhodecode \
     # SVN CONFIG
     MOD_DAV_SVN_CONF_FILE=/etc/rhodecode/conf/svn/mod_dav_svn.conf \
-    MOD_DAV_SVN_PORT=8090
+    MOD_DAV_SVN_PORT=8090 \
+    MOD_DAV_SVN_LOG_LEVEL=info
 
 ENV SVN_LOCALE_DEPS apache2 apache2-utils libapache2-mod-svn subversion
 #apache2-webdav

service/svn/virtualhost.conf

@@ -6,9 +6,9 b' LoadModule dav_svn_module ${MOD_DAV_SVN_MODULE}'
 ErrorLogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"function\" : \"[%-m:%l]\" , \"process\" : \"[pid %P:tid %T]\" , \"message\" : \"%M\" ,\ \"referer\"\ : \"%{Referer}i\" }"
 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
 
-ErrorLog /dev/stderr
-TransferLog /dev/stdout
-CustomLog /dev/stdout combined
+ErrorLog /proc/self/fd/2
+CustomLog /proc/self/fd/1 combined
+LogLevel ${MOD_DAV_SVN_LOG_LEVEL}
 
 <VirtualHost *:${MOD_DAV_SVN_PORT}>
     ServerAdmin admin@localhost
@@ -17,10 +17,6 b' CustomLog /dev/stdout combined'
     ErrorLogFormat "{ \"time\":\"%{%Y-%m-%d}tT%{%T}t.%{msec_frac}tZ\", \"function\" : \"[%-m:%l]\" , \"process\" : \"[pid %P:tid %T]\" , \"message\" : \"%M\" ,\ \"referer\"\ : \"%{Referer}i\" }"
     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
 
-    ErrorLog /dev/stderr
-    CustomLog /dev/stdout combined
-    LogLevel info
-
     <Location /_server_status>
         Require ip 127
         SetHandler server-status