Deactivate subversion server in default config

diff --git a/config/sysinfos.default b/config/sysinfos.default
index 1ffd631..abf9ee3 100644 (file)
--- a/config/sysinfos.default
+++ b/config/sysinfos.default
@@ -121,6 +121,8 @@ SANE_SUPPORT="yes"
 # variable to the IP address of that remote computer.
 SANE_SERVER=""
 
+SVN_SERVER="no"
+
 # Define this if you want to use a remote CUPS print server
 #CUPS_SERVER="server.mydomain.com"
 

diff --git a/stage3/pkg/subversion b/stage3/pkg/subversion
index 6a1a135..69a4e31 100644 (file)
--- a/stage3/pkg/subversion
+++ b/stage3/pkg/subversion
@@ -1,27 +1,8 @@
 #!/bin/bash
 
-SVN_USER=svn
-
-hvconfig_pre()
-{
-    groupadd -f ${SVN_USER}
-    hv_useradd -c SvnServer -d /dev/null -g ${SVN_USER} -s /bin/false ${SVN_USER}
-}
-
-hvbuild()
+hvbuild_post()
 {
-    ${HVMAKE}
-    
     # Build perl bindings (needed by git-svn)
     ${HVMAKE} swig-pl
-
-    ${HVMAKE} install
     ${HVMAKE} install-swig-pl
 }
-
-hvbuild_post()
-{
-    # Creating repositories directory
-    mkdir -p /srv/svn
-    chown ${SVN_USER}:${SVN_USER} /srv/svn
-}

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index bdc8822..1617845 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -231,8 +231,10 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg -m noac ${SQUIRRELMAIL}
     ipkg ${FETCHMAIL} "--with-ssl"
 
-    # Subversion server (client was already installed in stage2)
-    ipkg ${SUBVERSION}
+    if [ x"${SVN_SERVER}" == xyes ]; then
+        # Subversion server (client was already installed in stage3)
+        ipkg ${SUBVERSION}
+    fi
 fi
 
 ipkg ${LIBGSF}

diff --git a/stage5/pkg/subversion b/stage5/pkg/subversion
new file mode 100644 (file)
index 0000000..e3a0bbe
--- /dev/null
+++ b/stage5/pkg/subversion
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+SVN_USER=svn
+
+hvconfig_pre()
+{
+    groupadd -f ${SVN_USER}
+    hv_useradd -c SvnServer -d /dev/null -g ${SVN_USER} -s /bin/false ${SVN_USER}
+}
+
+hvbuild_post()
+{
+    # Build perl bindings (needed by git-svn)
+    ${HVMAKE} swig-pl
+    ${HVMAKE} install-swig-pl
+}
+
+hvbuild_post()
+{
+    # Creating repositories directory
+    mkdir -p /srv/svn
+    chown ${SVN_USER}:${SVN_USER} /srv/svn
+}