From b4b606102d6f0bd19e02efaf0d4d10010eeb3765 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sat, 9 Jan 2010 17:47:50 +0100
Subject: tomcat, maj post-install

---
 extra/tomcat/post-install   | 16 ++++++++++++++++
 extra/tomcat/tomcat.install | 37 -------------------------------------
 2 files changed, 16 insertions(+), 37 deletions(-)
 create mode 100755 extra/tomcat/post-install
 delete mode 100755 extra/tomcat/tomcat.install

(limited to 'extra')

diff --git a/extra/tomcat/post-install b/extra/tomcat/post-install
new file mode 100755
index 000000000..be8e6e36d
--- /dev/null
+++ b/extra/tomcat/post-install
@@ -0,0 +1,16 @@
+  if [ ! `grep tomcat /etc/group` ]; then
+    groupadd -g 66 tomcat &>/dev/null;
+  fi
+
+  id tomcat &>/dev/null || \
+    useradd -u 66 -g tomcat -d /opt/tomcat -s /bin/false tomcat
+  
+  if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
+    echo ">>> It appears that your current kernel has linux security"
+    echo ">>> capabilities built as a module.  tomcat requires this"
+    echo ">>> functionality to operate."
+    echo ">>>"
+    echo ">>> To activate the module, please load it now (modprobe capability)."
+    echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
+    echo ">>> it will be activated automatically at boot-up."
+  fi
diff --git a/extra/tomcat/tomcat.install b/extra/tomcat/tomcat.install
deleted file mode 100755
index 3ed956226..000000000
--- a/extra/tomcat/tomcat.install
+++ /dev/null
@@ -1,37 +0,0 @@
-post_install() {
-  if [ ! `grep tomcat /etc/group` ]; then
-    groupadd -g 66 tomcat &>/dev/null;
-  fi
-
-  id tomcat &>/dev/null || \
-    useradd -u 66 -g tomcat -d /opt/tomcat -s /bin/false tomcat
-  
-  if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
-    echo ">>> It appears that your current kernel has linux security"
-    echo ">>> capabilities built as a module.  tomcat requires this"
-    echo ">>> functionality to operate."
-    echo ">>>"
-    echo ">>> To activate the module, please load it now (modprobe capability)."
-    echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
-    echo ">>> it will be activated automatically at boot-up."
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  userdel tomcat &> /dev/null
-  groupdel tomcat &> /dev/null
-}
-
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-
-$op $*
-# vim: ts=2 sw=2 et ft=sh
-- 
cgit v1.2.3-70-g09d2