[PC-BSD Commits] r17408 - in pbi/modules/www/squid31: . scripts

svn at pcbsd.org svn at pcbsd.org
Mon Jun 25 08:00:50 PDT 2012


Author: kenmoore
Date: 2012-06-25 15:00:50 +0000 (Mon, 25 Jun 2012)
New Revision: 17408

Modified:
   pbi/modules/www/squid31/pbi.conf
   pbi/modules/www/squid31/scripts/post-install.sh
Log:
Remove the group/user scripting stuff from www/squid31 and rebuild



Modified: pbi/modules/www/squid31/pbi.conf
===================================================================
--- pbi/modules/www/squid31/pbi.conf	2012-06-25 14:56:37 UTC (rev 17407)
+++ pbi/modules/www/squid31/pbi.conf	2012-06-25 15:00:50 UTC (rev 17408)
@@ -22,6 +22,6 @@
 PBI_MAKEPORT="www/squid31"
 
 PBI_REQUIRESROOT="YES"; export PBI_REQUIRESROOT
-PBI_BUILDKEY="02"; export PBI_BUILDKEY
+PBI_BUILDKEY="03"; export PBI_BUILDKEY
  
 export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT

Modified: pbi/modules/www/squid31/scripts/post-install.sh
===================================================================
--- pbi/modules/www/squid31/scripts/post-install.sh	2012-06-25 14:56:37 UTC (rev 17407)
+++ pbi/modules/www/squid31/scripts/post-install.sh	2012-06-25 15:00:50 UTC (rev 17408)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo "TOTALSTEPS: 4"
+echo "TOTALSTEPS: 3"
 echo "SETSETPS: 1"
 echo "MSG: Configurating"
 
@@ -26,44 +26,6 @@
 echo "SETSETPS: 2"
 echo "squid_enable=\"YES\"" >> /etc/rc.conf
 
-if [ -x /usr/sbin/nologin ]; then
-        nologin=/usr/sbin/nologin
-else
-        nologin=/sbin/nologin
-fi
-squid_user="squid"
-squid_group="squid"
-squid_gid=100
-squid_uid=100
-if ! pw groupshow ${squid_group} -q >/dev/null ; then
-          echo "There is no group '${squid_group}' on this system, so I will try to create it (using group id ${squid_gid}):"
-          if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
-                  echo "Failed to create group \"${squid_group}\"!" >&2
-                  echo "Please create it manually." >&2
-          fi
-else
-  echo "I will use the existing group '${squid_group}':"
-fi
-pw groupshow ${squid_group}
-
-
-if ! pw usershow ${squid_user} -q >/dev/null ; then
-  echo "There is no account '${squid_user}' on this system, so I will try to create it (using user id ${squid_uid}):"
-  if ! pw useradd -q -n ${squid_user} \
-    -u ${squid_uid} -g ${squid_group} \
-    -c "Squid caching-proxy pseudo user" \
-    -d "${squid_base}" -s "${nologin}" \
-    -h - ; then
-    echo "Failed to create user '${squid_user}'!" >&2
-    echo "Please create it manually." >&2
-  else
-    echo "User '${squid_user}' created successfully:"
-  fi
-else
-  echo "I will use the existing user '${squid_user}':"
-fi
-
-
 mkdir -p ${PBI_PROGDIRPATH}/squid/logs >/dev/null 2>/dev/null
 mkdir -p ${PBI_PROGDIRPATH}/squid/cache >/dev/null 2>/dev/null
 chown -R squid:squid ${PBI_PROGDIRPATH}/squid
@@ -77,6 +39,4 @@
 ${PBI_RCDIR}/squid start
 
 echo "MSG: Finished!"
-echo "SETSETPS: 4"
 
-



More information about the Commits mailing list