saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index b2a1f0115fcf26bd6d93283e6c9d67b3610bf485..b920f211e970186473003dbebd27f5d8beb78218 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -23,6 +23,7 @@ maybe chmod 0755 'apache2'
 maybe chmod 0644 'apache2/httpd.conf'
 maybe chmod 0644 'apache2/magic'
 maybe chmod 0755 'apache2/modules.d'
+maybe chmod 0644 'apache2/modules.d/.keep_dev-vcs_subversion-0'
 maybe chmod 0644 'apache2/modules.d/.keep_www-servers_apache-2'
 maybe chmod 0644 'apache2/modules.d/00_default_settings.conf'
 maybe chmod 0644 'apache2/modules.d/00_error_documents.conf'
@@ -39,6 +40,7 @@ maybe chmod 0644 'apache2/modules.d/40_mod_ssl.conf'
 maybe chmod 0644 'apache2/modules.d/41_mod_http2.conf'
 maybe chmod 0644 'apache2/modules.d/45_mod_dav.conf'
 maybe chmod 0644 'apache2/modules.d/46_mod_ldap.conf'
+maybe chmod 0644 'apache2/modules.d/47_mod_dav_svn.conf'
 maybe chmod 0755 'apache2/vhosts.d'
 maybe chmod 0644 'apache2/vhosts.d/.keep_www-servers_apache-2'
 maybe chmod 0644 'apache2/vhosts.d/00_default_ssl_vhost.conf'

diff --git a/apache2/modules.d/.keep_dev-vcs_subversion-0 b/apache2/modules.d/.keep_dev-vcs_subversion-0
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/apache2/modules.d/47_mod_dav_svn.conf b/apache2/modules.d/47_mod_dav_svn.conf
new file mode 100644 (file)
index 0000000..52d08b7
--- /dev/null
+++ b/apache2/modules.d/47_mod_dav_svn.conf
@@ -0,0 +1,16 @@
+<IfDefine SVN>
+LoadModule dav_svn_module modules/mod_dav_svn.so
+<IfDefine SVN_AUTHZ>
+LoadModule authz_svn_module modules/mod_authz_svn.so
+</IfDefine>
+
+# Example configuration:
+#<Location /svn/repos>
+#       DAV svn
+#       SVNPath ${SVN_REPOS_LOC}/repos
+#       AuthType Basic
+#       AuthName "Subversion repository"
+#       AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
+#       Require valid-user
+#</Location>
+</IfDefine>

diff --git a/init.d/svnserve b/init.d/svnserve
index 8c1e21ab2da7241cbc5a87fa25e3f7d87dcf61e0..28a69f3d02ef3432e7af3a8c38e72e91c067a63e 100755 (executable)
--- a/init.d/svnserve
+++ b/init.d/svnserve
@@ -8,7 +8,7 @@ pidfile="/var/run/svnserve.pid"
 command="/usr/bin/svnserve"
 command_args="--foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}"
 command_background="true"
-start_stop_daemon_args="-u ${SVNSERVE_USER:-svn} -g ${SVNSERVE_GROUP:-svnusers}"
+start_stop_daemon_args="-u ${SVNSERVE_USER:-apache} -g ${SVNSERVE_GROUP:-apache}"
 
 depend() {
        need net

diff --git a/xinetd.d/svnserve b/xinetd.d/svnserve
index 78034653575963761d354709d1cc6a4a95084862..e29f906b509648326dddaeb1185d27d6d32a60b7 100644 (file)
--- a/xinetd.d/svnserve
+++ b/xinetd.d/svnserve
@@ -2,8 +2,8 @@ service svn
 {
     socket_type     = stream
     wait            = no
-    user            = svn
-    group           = svnusers
+    user            = apache
+    group           = apache
     umask           = 002
     protocol        = tcp
     log_on_failure += USERID HOST