adding user and group support for svn management

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@561 04377dda-e619-0410-9926-eae83683ac58

1 files changed, 91 insertions, 56 deletions

diff --git a/trunk/conf/simplepkg.conf b/trunk/conf/simplepkg.conf
index 077fc94..6011cd8 100644
--- a/trunk/conf/simplepkg.conf
+++ b/trunk/conf/simplepkg.conf
@@ -1,7 +1,15 @@
+#---------------------------------------------------------------------
+# Default simplepkg configuration.
+# File: /etc/simplepkg/default/simplepkg.conf
 #
-# /etc/simplepkg/default/simplepkg.conf
-#
+# This file contains the default behaviour of simplepkg scripts.
+# Please do not edit this file. Use /etc/simplepkg/simplepkg.conf
+# instead for overriding the default configuration.
+#---------------------------------------------------------------------
 
+#---------------------------------------------------------------------
+#                        GENERAL SECTION
+#---------------------------------------------------------------------
 # Default architecture: set this option if you dont want simplepkg
 # to use the value from /etc/slackware-version
 # DEFAULT_ARCH="i386"
@@ -13,12 +21,78 @@
 # Temporary folder
 TMP="/tmp"
 
-# Where jails are placed
-JAIL_ROOT="/vservers"
+#---------------------------------------------------------------------
+#                     MKBUILD AND CREATEPKG SECTION
+#---------------------------------------------------------------------
 
-# Wheter mkjail should add new jails in the jail list;
-# to enable it, set to "1" or "yes"
-ADD_TO_JAIL_LIST="1"
+# Set SlackBuilds default directory for scripts
+SLACKBUILDS_DIR="/var/simplepkg/slackbuilds"
+
+# Set default directory for mkbuilds
+MKBUILDS_DIR="/var/simplepkg/mkbuilds"
+
+# Set SlackBuilds svn default repository
+SLACKBUILDS_SVN="http://slack.sarava.org/slackbuilds"
+
+# Set mkbuilds svn default repository
+MKBUILDS_SVN="http://slack.sarava.org/mkbuilds"
+
+# Set binaries default repository directory
+MAKEPKG_REPOS="/var/simplepkg/repos"
+
+# Set the binaries default repository nested folder, useful if you manage
+# packages from different distribution versions and architectures in the
+# same parent folder.
+#
+# You can use any string here and also de special parameters none, distro,
+# arch and version. You can also mix more than one parameter, like
+# "distro-version".
+#
+# Default value is "distro/distro-version" and you should change this just
+# if you know what are you doing.
+MAKEPKG_REPOS_STYLE="distro/distro-version"
+
+# If your binary repository is under svn and you plan to manage it with an
+# user different than root, then set this parameter with the username
+# owning the repository working copy.
+MAKEPKG_SVN_USER=""
+
+# Same as the previous option, but for svn repository group.
+MAKEPKG_SVN_GROUP=""
+
+# If your mkbuild and slackbuild repositories is under svn and you plan to
+# manage it with an user different than root, then set this parameter with the
+# username owning the repository working copy.
+MKBUILDS_SVN_USER=""
+
+# Same as the previous option, but for svn repository group.
+MKBUILDS_SVN_GROUP=""
+
+# Set sources default directory
+SOURCE_DIR="/var/simplepkg/sources"
+
+# Set color style
+# possible values are: color,gray, none
+COLOR_MODE="none"
+
+# Createpkg architecture
+CREATE_ARCH="i486"
+
+# Remove build files
+CREATE_CLEANUP="yes"
+
+# Remove old packages from repository tree by createpkg
+REMOVE_OLD_PACKAGE="off"
+
+# Move package to SlackBuilds-like tree
+MOVE_BIN_PACKAGE="on"
+
+# Move package's slack-required to binary repository
+MOVE_SLACK_REQUIRED="on"
+
+#---------------------------------------------------------------------
+#                        SIMPLARET SECTION
+#---------------------------------------------------------------------
 
 # Whether mkjail should clean the package cache before installation
 # to enable it, set to "1" or "yes"
@@ -107,6 +181,10 @@ CONSIDER_ALL_PACKAGES_AS_PATCHES="0"
 # stored in the same tree.
 STORE_ROOT_PATCHES_ON_PATCHES_DIR="0"
 
+#---------------------------------------------------------------------
+#                         TEMPLATEPKG SECTION
+#---------------------------------------------------------------------
+
 # Set to yes if your templates will be placed in a subversion repository
 # This just work if TEMPLATE_STORAGE_STYLE is set to own-folder (default)
 TEMPLATES_UNDER_SVN="no"
@@ -127,55 +205,12 @@ TEMPLATE_FOLDER="/etc/simplepkg/templates"
 TEMPLATE_STORAGE_STYLE="own-folder"
 
 #---------------------------------------------------------------------
-#                     MKBUILD AND CREATEPKG SECTION
+#                        MKJAIL SECTION
 #---------------------------------------------------------------------
-# Set SlackBuilds default directory from scripts
-SLACKBUILDS_DIR="/var/simplepkg/slackbuilds"
-
-# Set mkbuild default directory from parameters files
-MKBUILDS_DIR="/var/simplepkg/mkbuilds"
-
-# Set SlackBuilds svn default repository
-SLACKBUILDS_SVN="http://slack.sarava.org/slackbuilds"
-
-# Set mkbuilds svn default repository
-MKBUILDS_SVN="http://slack.sarava.org/mkbuilds"
-
-# Set binaries default repository directory
-MAKEPKG_REPOS="/var/simplepkg/repos"
-
-# Set the binaries default repository nested folder, useful if you manage
-# packages from different distribution versions and architectures in the
-# same parent folder.
-#
-# You can use any string here and also de special parameters none, distro,
-# arch and version. You can also mix more than one parameter, like
-# "distro-version".
-#
-# Default value is "distro/distro-version" and you should change this just
-# if you know what are you doing.
-MAKEPKG_REPOS_STYLE="distro/distro-version"
-
-# Set sources default directory
-SOURCE_DIR="/var/simplepkg/sources"
-
-# Set color style
-# possible values are: color,gray, none
-COLOR_MODE="none"
-
-# Createpkg architecture
-CREATE_ARCH="i486"
-
-# Remove build files
-CREATE_CLEANUP="yes"
-
-# Remove old packages from repository tree by createpkg
-REMOVE_OLD_PACKAGE="off"
 
-# Move package to SlackBuilds-like tree
-MOVE_BIN_PACKAGE="on"
-
-# Move package's slack-required to binary repository
-MOVE_SLACK_REQUIRED="on"
+# Where jails are placed
+JAIL_ROOT="/vservers"
 
-#---------------------------------------------------------------------
+# Wheter mkjail should add new jails in the jail list;
+# to enable it, set to "1" or "yes"
+ADD_TO_JAIL_LIST="1"