Remove hidden-by-default modules, now we have the un-used category

diff --git a/jabber/module.info b/jabber/module.info
index 5486b59..3f201cb 100644 (file)
--- a/jabber/module.info
+++ b/jabber/module.info
@@ -9,6 +9,5 @@ desc_ru_RU=
 longdesc=Configure the multi-protocol Jabber messaging server.
 cpan=1
 os_support=!windows
-nondefault=1
 desc_cz=Jabber IM server
 desc_nl=Jabber IM Server

diff --git a/sentry/module.info b/sentry/module.info
index be63b79..13c741d 100644 (file)
--- a/sentry/module.info
+++ b/sentry/module.info
@@ -10,6 +10,5 @@ desc_ru_RU=
 longdesc=Configure the portsentry, hostsentry and logcheck system security monitoring programs.
 readonly=1
 os_support=!windows
-nondefault=1
 desc_cz=Bezpeènostní hlídaè
 desc_nl=Beveiligings Sentries (Schildwachten)

diff --git a/setup.sh b/setup.sh
index 6849b59..6494a20 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -77,10 +77,6 @@ fi
 
 # Validate source directory
 allmods=`cd "$srcdir"; echo */module.info | sed -e 's/\/module.info//g'`
-defaultallmods=`cd "$srcdir"; echo */module.info | xargs grep -L nondefault=1 2>/dev/null | sed -e 's/\/module.info//g'`
-if [ "$defaultallmods" = "" ]; then
-       defaultallmods="$allmods"
-fi
 if [ "$allmods" = "" ]; then
        echo "ERROR: Failed to get module list"
        echo ""
@@ -563,7 +559,7 @@ EOF
        afile=$config_dir/webmin.acl
        rm -f $afile
        if [ "$defaultmods" = "" ]; then
-               echo "$login: $defaultallmods" >> $afile
+               echo "$login: $allmods" >> $afile
        else
                echo "$login: $defaultmods" >> $afile
        fi