- s/LOCALBASE/PREFIX
- s/%SYSCONFDIR%/etc where it makes sense (e.g. /etc/rc.conf.local will always be /etc/rc.conf.local whatever value ${SYSCONFDIR} is set to) - use SUBST_CMD - don't hardcode /usr/local - precise license marker - s/definately/definitely/ (from sthen@) "looks good" sthen@, ok todd@
This commit is contained in:
parent
6dcf21e921
commit
9b9cb3fe51
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.21 2008/10/12 00:12:07 todd Exp $
|
||||
# $OpenBSD: Makefile,v 1.22 2008/10/12 17:31:17 ajacoutot Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= i386
|
||||
|
||||
@ -6,7 +6,7 @@ COMMENT= OpenAFS distributed filesystem
|
||||
|
||||
VERSION= 1.4.7
|
||||
DISTNAME= openafs-${VERSION}
|
||||
PKGNAME= ${DISTNAME}p2
|
||||
PKGNAME= ${DISTNAME}p3
|
||||
|
||||
CATEGORIES= net
|
||||
|
||||
@ -14,6 +14,7 @@ HOMEPAGE= http://www.openafs.org
|
||||
|
||||
MAINTAINER= Todd T. Fries <todd@openbsd.org>
|
||||
|
||||
# IBM Public License 1.0
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
@ -54,24 +55,18 @@ post-patch:
|
||||
|
||||
post-install:
|
||||
@${INSTALL_DATA_DIR} ${PREFIX}/share/openafs
|
||||
.for file in README.OpenBSD
|
||||
sed -e s,%LOCALBASE%,${LOCALBASE},g \
|
||||
-e s,%SYSCONFDIR%,${SYSCONFDIR},g \
|
||||
< ${FILESDIR}/${file} > ${PREFIX}/share/openafs/${file}
|
||||
.endfor
|
||||
${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD \
|
||||
${PREFIX}/share/openafs/README.OpenBSD
|
||||
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openafs
|
||||
.for file in krb5.conf
|
||||
sed -e s,%LOCALBASE%,${LOCALBASE},g \
|
||||
-e s,%SYSCONFDIR%,${SYSCONFDIR},g \
|
||||
< ${FILESDIR}/${file} > \
|
||||
${PREFIX}/share/examples/openafs/${file}
|
||||
.endfor
|
||||
.for file in openafs-setup
|
||||
sed -e s,%LOCALBASE%,${LOCALBASE},g \
|
||||
-e s,%SYSCONFDIR%,${SYSCONFDIR},g \
|
||||
< ${FILESDIR}/${file} > ${PREFIX}/sbin/${file}
|
||||
chmod u+x ${PREFIX}/sbin/${file}
|
||||
.endfor
|
||||
${SUBST_CMD} -c ${FILESDIR}/krb5.conf \
|
||||
${PREFIX}/share/examples/openafs/krb5.conf
|
||||
${SUBST_CMD} -c ${FILESDIR}/openafs-setup \
|
||||
${PREFIX}/sbin/openafs-setup
|
||||
chown ${BINOWN}:${BINGRP} \
|
||||
${PREFIX}/share/openafs/README.OpenBSD \
|
||||
${PREFIX}/share/examples/openafs/krb5.conf \
|
||||
${PREFIX}/sbin/openafs-setup
|
||||
chmod u+x ${PREFIX}/sbin/openafs-setup
|
||||
|
||||
.if ${FLAVOR:L:Mdebug}
|
||||
CONFIGURE_ARGS+= --enable-debug
|
||||
|
@ -23,26 +23,26 @@ Some knob twiddling you may find useful:
|
||||
To setup OpenAFS, you must first have a KerberosV realm setup. Below
|
||||
are brief instructions to do so. See 'info heimdal' for further details.
|
||||
|
||||
Once the KerberosV realm is setup, run '%LOCALBASE%/sbin/openafs-setup'
|
||||
Once the KerberosV realm is setup, run '${PREFIX}/sbin/openafs-setup'
|
||||
to setup your first OpenAFS server in your cell.
|
||||
|
||||
Finally, you should add the below to /etc/rc.local:
|
||||
|
||||
if [ -x /usr/local/sbin/bosserver ]; then
|
||||
if [ -x ${PREFIX}/sbin/bosserver ]; then
|
||||
echo -n " openafs"
|
||||
PATH=/usr/local/bin:/usr/local/sbin:$PATH
|
||||
/usr/local/sbin/bosserver -log -syslog
|
||||
PATH=${PREFIX}/bin:${PREFIX}/sbin:$PATH
|
||||
${PREFIX}/sbin/bosserver -log -syslog
|
||||
|
||||
# to salvage automatically on startup, for the paranoid
|
||||
#echo -n "(salvaging afs volumes $start ..."
|
||||
#/usr/local/bin/bos salvage localhost -all -orphans attach -localauth
|
||||
#${PREFIX}/bin/bos salvage localhost -all -orphans attach -localauth
|
||||
#echo -n " $stop done)"
|
||||
fi
|
||||
|
||||
and add the following to /etc/rc.shutdown:
|
||||
|
||||
if [ -x /usr/local/bin/bos ]; then
|
||||
/usr/local/bin/bos shutdown localhost -localauth -wait
|
||||
if [ -x ${PREFIX}/bin/bos ]; then
|
||||
${PREFIX}/bin/bos shutdown localhost -localauth -wait
|
||||
sleep 1
|
||||
pkill bosserver
|
||||
fi
|
||||
@ -70,7 +70,7 @@ Setting a default krb5.conf is useful on all AFS clients and servers.
|
||||
cell=example.com
|
||||
host=kdc0
|
||||
sed 's/%host%/'$host'/g;s/%cell%/'$cell'/g;s/%REALM%/'$REALM'/g' \
|
||||
< %LOCALBASE%/share/examples/openafs/krb5.conf > krb5.conf
|
||||
< ${PREFIX}/share/examples/openafs/krb5.conf > krb5.conf
|
||||
|
||||
Create the heimdal directory:
|
||||
|
||||
|
@ -14,8 +14,8 @@
|
||||
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
afsp=%LOCALBASE%/libexec/openafs
|
||||
PATH=%LOCALBASE%/sbin:%LOCALBASE%/bin:$PATH
|
||||
afsp=${PREFIX}/libexec/openafs
|
||||
PATH=${PREFIX}/sbin:${PREFIX}/bin:$PATH
|
||||
DIR=`mktemp -d /tmp/_openafs.XXXXXXXXXX` || exit 1
|
||||
trap 'rm -rf $DIR; exit 1' 0 1 2 3 13 15
|
||||
OUTPUT=$DIR/_1
|
||||
@ -208,14 +208,14 @@ then
|
||||
cat <<__EOT
|
||||
|
||||
The hostname for this afs server should resolve in dns but
|
||||
definately reside in %SYSCONFDIR%/hosts. e.g. afs0.example.com.
|
||||
definitely reside in /etc/hosts. e.g. afs0.example.com.
|
||||
__EOT
|
||||
while :; do
|
||||
ask_until "System hostname?" "$(hostname)"
|
||||
h=${resp}
|
||||
if [[ `grep $h %SYSCONFDIR%/hosts` = "" ]]
|
||||
if [[ `grep $h /etc/hosts` = "" ]]
|
||||
then
|
||||
echo "Could not find %SYSCONFDIR%/hosts entry for $h."
|
||||
echo "Could not find /etc/hosts entry for $h."
|
||||
continue
|
||||
fi
|
||||
break
|
||||
@ -223,15 +223,15 @@ __EOT
|
||||
cat <<__EOT
|
||||
|
||||
The IPv4 IP address for this afs server should resolve in dns but
|
||||
definately reside in %SYSCONFDIR%/hosts. e.g. 192.168.1.200.
|
||||
definitely reside in /etc/hosts. e.g. 192.168.1.200.
|
||||
__EOT
|
||||
while :; do
|
||||
ask_until "System IP?" "$(host $h | \
|
||||
awk '/has address/{print $4}')"
|
||||
ip=${resp}
|
||||
if [[ `grep $ip %SYSCONFDIR%/hosts` = "" ]]
|
||||
if [[ `grep $ip /etc/hosts` = "" ]]
|
||||
then
|
||||
echo "Could not find %SYSCONFDIR%/hosts entry for $ip."
|
||||
echo "Could not find /etc/hosts entry for $ip."
|
||||
continue
|
||||
fi
|
||||
break
|
||||
@ -301,7 +301,7 @@ ask_yn "Are you really sure that you're ready to proceed?"
|
||||
[[ $resp == n ]] && { echo "Ok, try again later.\n" ; exit ; }
|
||||
|
||||
echo
|
||||
log "preparing %SYSCONFDIR%/{open,}afs /usr/afs /var/openafs..."
|
||||
log "preparing ${SYSCONFDIR}/{open,}afs /usr/afs /var/openafs..."
|
||||
|
||||
kdestroy
|
||||
pkill -9 afsd
|
||||
@ -316,21 +316,21 @@ then
|
||||
bos shutdown localhost -localauth -wait > /dev/null 2>&1
|
||||
fi
|
||||
pkill -9 buserver ptserver vlserver fileserver volserver bos bosserver
|
||||
rm -rf %SYSCONFDIR%/openafs /usr/afs /var/openafs
|
||||
rm -rf ${SYSCONFDIR}/openafs /usr/afs /var/openafs
|
||||
rm -rf /vicep*/{V*,AFSIDat,Lock}
|
||||
rm -f %SYSCONFDIR%/kerberosV/krb5.keytab
|
||||
rm -f /etc/kerberosV/krb5.keytab
|
||||
|
||||
mkdir -p %SYSCONFDIR%/openafs/server /usr/afs /var/spool/afs
|
||||
mkdir -p ${SYSCONFDIR}/openafs/server /usr/afs /var/spool/afs
|
||||
mkdir -m 700 /var/openafs
|
||||
echo "f $ip" > /var/openafs/NetInfo
|
||||
echo "$R" > %SYSCONFDIR%/openafs/server/krb.conf
|
||||
echo "$R" > ${SYSCONFDIR}/openafs/server/krb.conf
|
||||
|
||||
log updating %SYSCONFDIR%/afs/CellServDB %SYSCONFDIR%/openafs/server/CellServDB
|
||||
# borrowed from %SYSCONFDIR%/security, backup CellServDB
|
||||
log updating /etc/afs/CellServDB ${SYSCONFDIR}/openafs/server/CellServDB
|
||||
# borrowed from /etc/security, backup CellServDB
|
||||
_fnchg() {
|
||||
echo "$1" | sed 's/^\///;s/\//_/g'
|
||||
}
|
||||
csdb=%SYSCONFDIR%/afs/CellServDB
|
||||
csdb=/etc/afs/CellServDB
|
||||
CURdb=/var/backups/$(_fnchg $csdb).current
|
||||
BACKdb=/var/backups/$(_fnchg $csdb).backup
|
||||
if [ -s $CURdb ]; then
|
||||
@ -349,11 +349,11 @@ trap 'rm -rf $DIR; cp $CURdb $csdb; exit 1' 0 1 2 3 13 15
|
||||
echo ">$c # $c" > $DIR/CellServDB
|
||||
echo "$ip #$h" >> $DIR/CellServDB
|
||||
cat $DIR/CellServDB | \
|
||||
tee -a $csdb %SYSCONFDIR%/openafs/server/CellServDB
|
||||
tee -a $csdb ${SYSCONFDIR}/openafs/server/CellServDB
|
||||
|
||||
echo $c | tee %SYSCONFDIR%/openafs/server/ThisCell > %SYSCONFDIR%/afs/ThisCell
|
||||
echo $c | tee ${SYSCONFDIR}/openafs/server/ThisCell > /etc/afs/ThisCell
|
||||
ln -s /var/openafs/db /usr/afs/db
|
||||
ln -s %SYSCONFDIR%/openafs/server /usr/afs/etc
|
||||
ln -s ${SYSCONFDIR}/openafs/server /usr/afs/etc
|
||||
if [ "$(pgrep bosserver)" ]
|
||||
then
|
||||
pkill bosserver
|
||||
@ -363,13 +363,13 @@ log authenticating $p@$R
|
||||
retry kinit $p@$R
|
||||
kadd host/$h --random-key
|
||||
retry kadmin ext host/$h
|
||||
chmod 0400 %SYSCONFDIR%/kerberosV/krb5.keytab
|
||||
chmod 0400 /etc/kerberosV/krb5.keytab
|
||||
kadd afs/$c --random-key
|
||||
log creating %SYSCONFDIR%/openafs/server/KeyFile
|
||||
log creating ${SYSCONFDIR}/openafs/server/KeyFile
|
||||
retry kadmin ext -k $DIR/afsv5key afs/$c
|
||||
log -c ktutil copy $DIR/afsv5key AFSKEYFILE:%SYSCONFDIR%/openafs/server/KeyFile
|
||||
ktutil copy $DIR/afsv5key AFSKEYFILE:%SYSCONFDIR%/openafs/server/KeyFile
|
||||
chmod 600 %SYSCONFDIR%/openafs/server/KeyFile
|
||||
log -c ktutil copy $DIR/afsv5key AFSKEYFILE:${SYSCONFDIR}/openafs/server/KeyFile
|
||||
ktutil copy $DIR/afsv5key AFSKEYFILE:${SYSCONFDIR}/openafs/server/KeyFile
|
||||
chmod 600 ${SYSCONFDIR}/openafs/server/KeyFile
|
||||
rm $DIR/afsv5key
|
||||
log When asked for a password below, the answer will set it.
|
||||
let sc=sc-1
|
||||
@ -430,8 +430,8 @@ retry kinit $A
|
||||
retry pts listentries
|
||||
|
||||
# do this on reboot
|
||||
grep "^afs=YES" %SYSCONFDIR%/rc.conf.local > /dev/null 2>&1 || \
|
||||
echo afs=YES >> %SYSCONFDIR%/rc.conf.local
|
||||
grep "^afs=YES" /etc/rc.conf.local > /dev/null 2>&1 || \
|
||||
echo afs=YES >> /etc/rc.conf.local
|
||||
|
||||
retry ls /afs
|
||||
|
||||
@ -480,23 +480,23 @@ retry vos release root.afs
|
||||
retry vos release root.cell
|
||||
retry vos release mirror
|
||||
|
||||
# add files of note to %SYSCONFDIR%/changelist
|
||||
# add files of note to /etc/changelist
|
||||
addchg() {
|
||||
while [ "$1" ]
|
||||
do
|
||||
f="$1"
|
||||
shift
|
||||
if egrep "^${f}$" %SYSCONFDIR%/changelist > /dev/null 2>&1; then
|
||||
if egrep "^${f}$" /etc/changelist > /dev/null 2>&1; then
|
||||
continue
|
||||
fi
|
||||
echo "$f" >> %SYSCONFDIR%/changelist
|
||||
echo "$f" >> /etc/changelist
|
||||
done
|
||||
}
|
||||
addchg %SYSCONFDIR%/kerberosV/krb5.conf
|
||||
addchg "+%SYSCONFDIR%/kerberosV/krb5.keytab"
|
||||
addchg %SYSCONFDIR%/afs/{CellServDB,ThisCell,afsd.conf}
|
||||
addchg %SYSCONFDIR%/openafs/{BosConfig,server/{CellServDB,ThisCell,UserList,krb.conf}}
|
||||
addchg "+%SYSCONFDIR%/openafs/server/KeyFile"
|
||||
addchg /etc/kerberosV/krb5.conf
|
||||
addchg "+/etc/kerberosV/krb5.keytab"
|
||||
addchg /etc/afs/{CellServDB,ThisCell,afsd.conf}
|
||||
addchg ${SYSCONFDIR}/openafs/{BosConfig,server/{CellServDB,ThisCell,UserList,krb.conf}}
|
||||
addchg "+${SYSCONFDIR}/openafs/server/KeyFile"
|
||||
addchg /var/openafs/NetInfo
|
||||
addchg "+/var/openafs/sysid"
|
||||
addchg "+/var/openafs/db/bdb.DB0"
|
||||
@ -511,7 +511,7 @@ cat <<__EOT
|
||||
|
||||
CONGRATULATIONS! Your OpenAFS server setup has been successfully completed,
|
||||
and is now running.
|
||||
Please read %LOCALBASE%/share/openafs/README.OpenBSD for further details;
|
||||
Please read ${PREFIX}/share/openafs/README.OpenBSD for further details;
|
||||
be sure to note the startup and shutdown script examples.
|
||||
__EOT
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user