new user/group schema

jolan@ ok
This commit is contained in:
sturm 2003-06-22 10:01:35 +00:00
parent a01b82e1b5
commit 749c5a55e7
10 changed files with 56 additions and 52 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.10 2003/05/12 08:23:46 jolan Exp $
# $OpenBSD: Makefile,v 1.11 2003/06/22 10:01:35 sturm Exp $
COMMENT= "opensource Napster(tm) server"
DISTNAME= opennap-0.44
PKGNAME= ${DISTNAME}p0
CATEGORIES= audio net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opennap/}
@ -22,7 +23,9 @@ CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= \
--enable-email \
--enable-resume \
--datadir=${SYSCONFDIR}
--datadir=${SYSCONFDIR} \
--with-uid=_opennap \
--with-gid=_opennap
# --enable-chroot \ (breaks uid, gid, and ip lookup)
DOCS= FAQ README manual.html napster.txt

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.3 2002/08/10 01:14:04 naddy Exp $
$OpenBSD: patch-configure,v 1.4 2003/06/22 10:01:35 sturm Exp $
--- configure.orig Sun Sep 30 17:12:46 2001
+++ configure Mon Aug 5 19:59:27 2002
@@ -1802,7 +1802,7 @@ else
@ -10,21 +10,3 @@ $OpenBSD: patch-configure,v 1.3 2002/08/10 01:14:04 naddy Exp $
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1809: checking for $ac_func" >&5
@@ -2003,7 +2003,7 @@ EOF
else
cat >> confdefs.h <<EOF
-#define USE_UID "nobody"
+#define USE_UID "opennap"
EOF
fi
@@ -2017,7 +2017,7 @@ EOF
else
cat >> confdefs.h <<EOF
-#define USE_GID "nobody"
+#define USE_GID "opennap"
EOF
fi

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.2 2002/08/10 01:14:04 naddy Exp $
# $OpenBSD: DEINSTALL,v 1.3 2003/06/22 10:01:35 sturm Exp $
#
# opennap de-installation
@ -7,8 +7,8 @@ set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}/opennap
OPENNAPUSER=opennap
OPENNAPGROUP=opennap
OPENNAPUSER=_opennap
OPENNAPGROUP=_opennap
if [ -d $CONFIG_DIR ]; then
echo

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.2 2002/08/10 01:14:04 naddy Exp $
# $OpenBSD: INSTALL,v 1.3 2003/06/22 10:01:35 sturm Exp $
#
# Pre/post-installation setup of opennap
@ -7,25 +7,24 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}/opennap
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/opennap
OPENNAPUSER=opennap
OPENNAPGROUP=opennap
OPENNAPUSER=_opennap
OPENNAPGROUP=_opennap
ID=500
do_usergroup_install()
{
# Create Opennap user and group
groupinfo -e $OPENNAPGROUP
if [ $? -eq 0 ]; then
if groupinfo -e $OPENNAPGROUP; then
echo "===> Using $OPENNAPGROUP group for Opennap"
else
echo "===> Creating $OPENNAPGROUP group for Opennap"
groupadd $OPENNAPGROUP
groupadd -g $ID $OPENNAPGROUP
fi
userinfo -e $OPENNAPUSER
if [ $? -eq 0 ]; then
if userinfo -e $OPENNAPUSER; then
echo "===> Using $OPENNAPUSER user for Opennap"
else
echo "===> Creating $OPENNAPUSER user for Opennap"
useradd -g $OPENNAPGROUP -d /nonexistent -L daemon -c 'Opennap Account' -s /sbin/nologin $OPENNAPUSER
useradd -g $OPENNAPGROUP -d /nonexistent -L daemon -c 'Opennap Account' -s /sbin/nologin -u $ID $OPENNAPUSER
fi
}
@ -44,9 +43,9 @@ do_notice()
do_install()
{
install -d -o opennap -g opennap -m 700 $CONFIG_DIR
install -d -o $OPENNAPUSER -g $OPENNAPGROUP -m 700 $CONFIG_DIR
echo "admin opennap email@here.com Elite 0 0" > $CONFIG_DIR/users
chown opennap:opennap $CONFIG_DIR/users
chown $OPENNAPUSER:$OPENNAPGROUP $CONFIG_DIR/users
chmod 600 $CONFIG_DIR/users
echo
echo "+---------------"

View File

@ -12,3 +12,12 @@ via the /etc/rc.local script:
if [ -x ${PREFIX}/sbin/opennap ]; then
echo -n ' opennap'; ${PREFIX}/sbin/opennap -b > /dev/null
fi
*********************
* WARNING!
*
* This port has changed its user/group from 'opennap' to '_opennap'. If you
* installed this port before, ensure all permissions are set correctly and
* then "rmuser opennap".
*********************

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2003/05/12 08:23:47 jolan Exp $
# $OpenBSD: Makefile,v 1.6 2003/06/22 10:01:35 sturm Exp $
.if ${MACHINE_ARCH} == "powerpc"
BROKEN= "config file parser bug on ${MACHINE_ARCH}"
@ -7,6 +7,7 @@ BROKEN= "config file parser bug on ${MACHINE_ARCH}"
COMMENT= "Secure Internet Live Conferencing (SILC) server"
DISTNAME= silc-server-0.9.13.1
PKGNAME= ${DISTNAME}p0
CATEGORIES= net
HOMEPAGE= http://www.silcnet.org/

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-doc_example_silcd_conf_in,v 1.1.1.1 2002/12/16 03:40:02 brad Exp $
$OpenBSD: patch-doc_example_silcd_conf_in,v 1.2 2003/06/22 10:01:35 sturm Exp $
--- doc/example_silcd.conf.in.orig Sat Nov 30 08:09:21 2002
+++ doc/example_silcd.conf.in Sat Dec 14 19:45:12 2002
@@ -35,7 +35,7 @@ General {
@ -52,8 +52,8 @@ $OpenBSD: patch-doc_example_silcd_conf_in,v 1.1.1.1 2002/12/16 03:40:02 brad Exp
#
- User = "nobody";
- Group = "nobody";
+ User = "silcd";
+ Group = "silcd";
+ User = "_silcd";
+ Group = "_silcd";
#
# Public and private keys

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.2 2002/12/29 21:22:13 brad Exp $
# $OpenBSD: DEINSTALL,v 1.3 2003/06/22 10:01:35 sturm Exp $
#
# silc-server de-installation
@ -7,8 +7,8 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}/silcd
LOG_DIR=/var/log/silcd
SILCDUSER=silcd
SILCDGROUP=silcd
SILCDUSER=_silcd
SILCDGROUP=_silcd
if [ -d $CONFIG_DIR ]; then
echo

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.2 2002/12/29 21:22:13 brad Exp $
# $OpenBSD: INSTALL,v 1.3 2003/06/22 10:01:35 sturm Exp $
#
# Pre/post-installation setup of silc-server
@ -8,8 +8,9 @@ PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}/silcd
LOG_DIR=/var/log/silcd
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/silcd
SILCDUSER=silcd
SILCDGROUP=silcd
SILCDUSER=_silcd
SILCDGROUP=_silcd
ID=512
do_usergroup_install()
{
@ -19,14 +20,14 @@ do_usergroup_install()
echo "===> Using $SILCDGROUP group for silc-server"
else
echo "===> Creating $SILCDGROUP group for silc-server"
groupadd $SILCDGROUP
groupadd -g $ID $SILCDGROUP
fi
userinfo -e $SILCDUSER
if [ $? -eq 0 ]; then
echo "===> Using $SILCDUSER user for silc-server"
else
echo "===> Creating $SILCDUSER user for silc-server"
useradd -g $SILCDGROUP -d /nonexistent -L daemon -c ' Silc-server Account' -s /sbin/nologin $SILCDUSER
useradd -g $SILCDGROUP -d /nonexistent -L daemon -c ' Silc-server Account' -s /sbin/nologin -u $ID $SILCDUSER
fi
}
@ -44,10 +45,10 @@ do_notice()
do_install()
{
install -d -o silcd -g silcd -m 700 $CONFIG_DIR
install -d -o silcd -g silcd -m 700 $LOG_DIR
install -o silcd -g silcd -m 600 $SAMPLE_CONFIG_DIR/silcd.conf $CONFIG_DIR/silcd.conf
install -o silcd -g silcd -m 600 $SAMPLE_CONFIG_DIR/silcalgs.conf $CONFIG_DIR/silcalgs.conf
install -d -o $SILCDUSER -g $SILCDGROUP -m 700 $CONFIG_DIR
install -d -o $SILCDUSER -g $SILCDGROUP -m 700 $LOG_DIR
install -o $SILCDUSER -g $SILCDGROUP -m 600 $SAMPLE_CONFIG_DIR/silcd.conf $CONFIG_DIR/silcd.conf
install -o $SILCDUSER -g $SILCDGROUP -m 600 $SAMPLE_CONFIG_DIR/silcalgs.conf $CONFIG_DIR/silcalgs.conf
echo
echo "+---------------"
echo "|"

View File

@ -11,7 +11,7 @@ recommended to take advantage of the installed silcd user and group.
If you have not already done so, you will need to generate a keypair:
# silcd -C ${SYSCONFDIR}/silcd
# chown silcd:silcd ${SYSCONFDIR}/silcd/silcd.{pub,prv}
# chown _silcd:_silcd ${SYSCONFDIR}/silcd/silcd.{pub,prv}
# chmod 600 ${SYSCONFDIR}/silcd/silcd.prv
Additionally, you may wish to start silcd at system start-up
@ -20,3 +20,12 @@ via the /etc/rc.local script:
if [ -x ${PREFIX}/sbin/silcd ]; then
echo -n ' silcd'; ${PREFIX}/sbin/silcd
fi
*********************
* WARNING!
*
* This port has changed its user/group from 'silcd' to '_silcd'. If you
* installed this port before, ensure all permissions are set correctly and
* then "rmuser silcd".
*********************