First release candidate

Author: erik-wramner

Dockerfile

@@ -18,6 +18,7 @@ RUN groupadd -r httpd && useradd -r -g httpd httpd \
     && mkdir -p /svn/config \
     && mkdir -p /svn/backup \
     && chown -R httpd:httpd /svn/repos
+COPY conf/* /svn/config/
 VOLUME ["/svn"]
 
 WORKDIR $HTTPD_PREFIX
@@ -178,12 +179,13 @@ RUN set -eux; \
     rm -r src src-svn man manual; \
     apt-get purge -y --auto-remove $buildDeps; \
     make-ssl-cert generate-default-snakeoil; \
-    ln -s /etc/ssl/private/ssl-cert-snakeoil.key /usr/local/apache2/conf/server.key; \
-    ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem /usr/local/apache2/conf/server.crt
+    mkdir -p /etc/ssl/localcerts; \
+    ln -s /etc/ssl/private/ssl-cert-snakeoil.key /etc/ssl/localcerts/server.key; \
+    ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/ssl/localcerts/server.crt; \
+    rm -f $HTTPD_PREFIX/conf/httpd.conf; \
+    ln -s /svn/config/httpd.conf $HTTPD_PREFIX/conf/httpd.conf
 
 COPY scripts/*.sh /usr/local/bin/
-COPY httpd-conf/httpd.conf $HTTPD_PREFIX/conf/
-COPY svn-conf/* /svn/config/
 
 EXPOSE 80 443
 CMD ["httpd-foreground.sh"]

README.md

@@ -12,6 +12,8 @@ docker run -d -p 80:80 -e SVN_REPO_NAME=test -e SVN_USER=admin -e SVN_PASSWORD=s
 ```
 
 That creates a Subversion repository named test and exposes it to the user admin with password securepassword on port 80 without SSL.
+The repository can be accessed at http://localhost/svn/test.
+
 For a slightly more realistic configuration run:
 
 ```
@@ -27,14 +29,13 @@ For production use without a fronting load balancer:
 
 ```
 docker run -d --name httpd-svn --mount source=v_svn,target=/svn \
-  --mount type=bind,source="$(pwd)/server.crt",target=/usr/local/apache2/conf/server.crt,readonly \
-  --mount type=bind,source="$(pwd)/server.key",target=/usr/local/apache2/conf/server.key,readonly \
+  --mount type=bind,source="$(pwd)/localcerts",target=/etc/ssl/localcerts,readonly \
   -p 443:443 -e HTTPD_SSL=on \
   -e HTTPD_SERVER_NAME=myhost.mydomain.com httpd-svn
 ```
 
-This uses a real SSL certificate mapped into the container and a volume for the repositories, configuration files and backups.
-Users are added manually:
+This uses a real SSL certificate (represented by server.crt and server.key in localcerts) mapped into the container
+and a volume for the repositories, configuration files and backups. Users are added manually:
 ```
 docker exec -it httpd-svn /bin/bash
 htpasswd -B /svn/config/svn-users someuser
@@ -45,18 +46,39 @@ docker exec -it httpd-svn /bin/bash
 svnadmin create /svn/repos/somerepo
 chown -R httpd:httpd /svn/repos/somerepo
 ```
-
 Backups can be created using the backup-svn-repos.sh script using an external cron job:
 ```
 docker exec httpd-svn backup-svn-repos.sh
 ```
 
 The backups are saved in the same volume as the repositories, so be sure to copy the files to another location as well.
 
+## Configuration
+
+There are many configuration options. It should be possible to use this image as is. The Apache configuration file
+(httpd.conf) is present in /svn/config in the /svn volume. That means it is possible to edit the configuration; the
+changes will persist. The same applies to the users and access rules (also in /svn/config) and of course to the
+repositories.
+
+The SSL certificates are stored in /etc/ssl/localcerts and can be replaced (see above). If intermediate certs are
+needed the httpd.conf file must be edited to include them, though.
+
+The following options are supported without the need for manual changes:
+* HTTPD_SERVER_NAME, the ServerName option for Apache. Set this to the external address.
+* HTTPD_SERVER_ADMIN, the mail address to the administrator for server-generated pages.
+* HTTPD_SSL, set this to use SSL and listen on port 443. If not set the server listens on port 80.
+* SVN_REPO_NAME, the name of a repository to create on startup.
+* SVN_USER, the name of a Subversion user to create on startup.
+* SVN_PASSWORD, the password for SVN_USER.
+
+The Subversion user will not be created if the svn-users file already exists. Likewise the repository will
+not be recreated if it exists.
 
 ## Notes
 
 * It is important to set the ServerName option to the real external host name, as Subversion (or rather DAV) needs it for the copy command.
   Set HTTPD_SERVER_NAME when using the default configuration or be sure to set it manually. If not defined the container's host name will
   be used and that is probably wrong.
 * It is a very good idea to require SSL/TLS or alternatively to use a web front with SSL.
+
+Suggestions and pull requests are welcome!

httpd-conf/httpd.conf renamed to conf/httpd.conf

@@ -196,8 +196,8 @@ LoadModule authz_svn_module   modules/mod_authz_svn.so
 
     # Put public and private key here, add intermediate certs to private key
     # or add SSLCertificateChainFile.
-    SSLCertificateFile "/usr/local/apache2/conf/server.crt"
-    SSLCertificateKeyFile "/usr/local/apache2/conf/server.key"
+    SSLCertificateFile "/etc/ssl/localcerts/server.crt"
+    SSLCertificateKeyFile "/etc/ssl/localcerts/server.key"
 </IfDefine>
 
 <IfModule unixd_module>