On jette ident2 qui est merdique au profit d'oidentd qui est moins merdique.
This commit is contained in:
Pierre-Elliott Bécue
parent
aabe513125
commit
6513ec4fba
6 changed files with 14 additions and 112 deletions
|
|
@ -1,18 +1,7 @@
|
|||
<Bundle name="identd" version="2.0">
|
||||
<Group name="wheezy">
|
||||
<Package name="ident2"/>
|
||||
<Group name="ident-daemon">
|
||||
<Path name="/etc/init.d/ident2"/>
|
||||
<Action name="link-ident2"/>
|
||||
<Service name="ident2"/>
|
||||
</Group>
|
||||
<!--Probleme (TODO) : lorsqu'on migre de l'un a l'autre, bcfg2 n'a pas le
|
||||
temps de retirer ident de inetd, ni meme de virer le service inetd tout
|
||||
seul.-->
|
||||
<Group name="ident-daemon" negate="true">
|
||||
<Package name="openbsd-inetd"/>
|
||||
<Path name="/etc/inetd.conf"/>
|
||||
<Service name="openbsd-inetd"/>
|
||||
</Group>
|
||||
</Group>
|
||||
<Package name="oidentd"/>
|
||||
<Action name="unlink-ident2"/>
|
||||
<Action name="delete-ident2"/>
|
||||
<Action name="kill-ident2"/>
|
||||
<Service name="oidentd"/>
|
||||
</Bundle>
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: ident2
|
||||
# Required-Start:
|
||||
# Required-Stop:
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Start/Stop RFC 1413 ident2 daemon
|
||||
# Description: The identd server provides a means to determine the identity
|
||||
# of a user of a particular TCP connection. Given a TCP port
|
||||
# number pair, it returns a character string which identifies
|
||||
# the owner of that connection on the server's system.
|
||||
### END INIT INFO
|
||||
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="RFC 1413 ident2 daemon"
|
||||
NAME=ident2
|
||||
BIN=/usr/sbin/$NAME
|
||||
BIN_ARGS=""
|
||||
PIDFILE=/var/run/$NAME.pid
|
||||
SCRIPTNAME=/etc/init.d/$NAME
|
||||
|
||||
# Exit if the package is not installed
|
||||
[ -x "$BIN" ] || exit 0
|
||||
|
||||
# Define LSB log_* functions.
|
||||
# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
|
||||
. /lib/lsb/init-functions
|
||||
|
||||
start(){
|
||||
log_daemon_msg "Starting ident daemon " "$NAME"
|
||||
# Use start-stop-daemon, without make-pidfile, ident
|
||||
# is creating its own itself.
|
||||
if start-stop-daemon --start \
|
||||
--oknodo \
|
||||
--pidfile $PIDFILE \
|
||||
--quiet \
|
||||
--startas $BIN \
|
||||
-- $BIN_ARGS; then
|
||||
log_end_msg 0
|
||||
else
|
||||
log_end_msg 1
|
||||
fi
|
||||
}
|
||||
|
||||
stop(){
|
||||
log_daemon_msg "Stopping ident daemon " "$NAME"
|
||||
if start-stop-daemon --stop \
|
||||
--oknodo \
|
||||
--pidfile $PIDFILE; then
|
||||
log_end_msg 0
|
||||
else
|
||||
log_end_msg 1
|
||||
fi
|
||||
}
|
||||
# See how we were called.
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart)
|
||||
stop
|
||||
start
|
||||
;;
|
||||
*)
|
||||
log_success_msg "Usage: $NAME {start|stop|restart}"
|
||||
exit 1
|
||||
esac
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
<FileInfo>
|
||||
<Info owner='root' group='root' perms='0755'/>
|
||||
</FileInfo>
|
||||
|
|
@ -11,7 +11,6 @@
|
|||
<Group name="comptage-upload"/>
|
||||
<Group name="connection-main"/>
|
||||
<Group name="firmware-bnx2"/>
|
||||
<Group name="ident-daemon"/>
|
||||
<Group name="vlan-ens"/>
|
||||
<Group name="vlan-wifi"/>
|
||||
<Group name="connexion-secours"/>-->
|
||||
|
|
@ -21,7 +20,6 @@
|
|||
<Group name="odlyd"
|
||||
profile="true">
|
||||
<Group name="crans-wheezy"/>
|
||||
<Group name="ident-daemon"/>
|
||||
<Group name="connection-main"/>
|
||||
<Group name="firewall"/>
|
||||
<Group name="portail-captif"/>
|
||||
|
|
@ -68,7 +66,6 @@
|
|||
<Group name="nginx"/> <!-- Pour roundcube -->
|
||||
<Group name="php"/> <!-- Pour roundcube -->
|
||||
<Group name="https_cert"/>
|
||||
<Group name="ident-daemon"/> <!-- pgsql speedup (webmail) -->
|
||||
</Group>
|
||||
|
||||
<Group name="mediadrop"
|
||||
|
|
@ -93,7 +90,6 @@
|
|||
<Group name="nginx"/> <!-- Pour horde -->
|
||||
<Group name="php"/> <!-- Pour horde -->
|
||||
<Group name="https_cert"/>
|
||||
<Group name="ident-daemon"/> <!-- pgsql speedup (webmail) -->
|
||||
</Group>
|
||||
|
||||
<Group name="zbee"
|
||||
|
|
@ -137,7 +133,6 @@
|
|||
<Group name="digicode"/>
|
||||
<Group name="crans-wheezy"/>
|
||||
<Group name="users"/>
|
||||
<Group name="ident-daemon"/>
|
||||
<Group name="http-server"/>
|
||||
<Group name="intranet-server"/>
|
||||
<Group name="print-server"/>
|
||||
|
|
@ -227,7 +222,6 @@
|
|||
<Group name="external"/>
|
||||
<Group name="pgsql-server"/>
|
||||
<Group name="sqlgrey-localdb"/>
|
||||
<Group name="ident-daemon"/>
|
||||
</Group>
|
||||
|
||||
<Group name="fy"
|
||||
|
|
@ -237,7 +231,6 @@
|
|||
<Group name="db-replicat"/>
|
||||
<Group name="sniffer"/>
|
||||
<Group name="munin-server"/>
|
||||
<Group name="ident-daemon"/>
|
||||
<Group name="vlan-wifi"/>
|
||||
<Group name="firmware-bnx2"/>
|
||||
|
||||
|
|
@ -257,7 +250,6 @@
|
|||
<Group name="pgsql-server"/>
|
||||
<Group name="sqlgrey-localdb"/>
|
||||
<Group name="db-replicat"/>
|
||||
<Group name="ident-daemon"/>
|
||||
<Group name="generate"/>
|
||||
</Group>
|
||||
|
||||
|
|
@ -334,7 +326,6 @@
|
|||
<Group name="crans-vm-wheezy"/>
|
||||
<Bundle name="check_cert"/>
|
||||
<Group name="asterisk-server"/>
|
||||
<Group name="ident-daemon"/>
|
||||
</Group>
|
||||
|
||||
<Group name="cochon"
|
||||
|
|
@ -373,7 +364,6 @@
|
|||
<Group name="crans-vm-wheezy"/>
|
||||
<Group name="intranet2-server"/>
|
||||
<Group name="https_cert"/>
|
||||
<Group name="ident-daemon"/>
|
||||
</Group>
|
||||
|
||||
<Group name="radius"
|
||||
|
|
@ -491,7 +481,6 @@
|
|||
<Bundle name="nfs-client"/>
|
||||
<Bundle name="git"/>
|
||||
<Bundle name="monit"/>
|
||||
<Bundle name="identd"/>
|
||||
</Group>
|
||||
|
||||
<Group name="crans-common">
|
||||
|
|
@ -501,6 +490,7 @@
|
|||
<!-- TODO: passer les serveurs en utf-8 sans tout casser...
|
||||
<Group name="locale"/>
|
||||
-->
|
||||
<Group name="identd"/>
|
||||
<Group name="ssh"/>
|
||||
<Group name="sudo"/>
|
||||
<Group name="home"/>
|
||||
|
|
@ -677,13 +667,10 @@
|
|||
<Group name="cgi"/>
|
||||
</Group>
|
||||
|
||||
<Group name="ident-daemon">
|
||||
<!-- démon ident standalone, plus rapide qu'inetd -->
|
||||
<!--NB: Le bundle ci-dessous est déjà fourni par le groupe crans.
|
||||
l'appartenance au groupe ci-dessus conditionne l'utilisation du
|
||||
démon standalone ou de inetd (plus lent mais plus léger en mémoire)-->
|
||||
<Group name="identd">
|
||||
<Bundle name="identd"/>
|
||||
</Group>
|
||||
|
||||
<!-- +==========+ -->
|
||||
<!-- | Services | -->
|
||||
<!-- +==========+ -->
|
||||
|
|
|
|||
|
|
@ -229,8 +229,8 @@ service("pgsql-server",
|
|||
pidp="/var/lib/postgresql/%s/main/postmaster.pid" % pg_version,
|
||||
extra=["if failed port 5432 timeout 30 seconds then restart"])
|
||||
|
||||
service("ident-daemon",
|
||||
name="ident2")
|
||||
service("identd",
|
||||
name="oidentd")
|
||||
|
||||
service("postfix",
|
||||
pidp="/var/spool/postfix/pid/master.pid",
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<!-- Règles concernant les serveurs avec identd //-->
|
||||
<Rules priority="1">
|
||||
<Service type="deb" name="openbsd-inetd" status="on"/>
|
||||
<Service type="deb" name="ident2" status="on"/>
|
||||
<Action name="link-ident2" timing="post" when="modified" status="check"
|
||||
command="update-rc.d ident2 defaults 45"/>
|
||||
<Action name="unlink-ident2" timing="post" when="modified" status="check" command="update-rc.d ident2 remove"/>
|
||||
<Action name="delete-ident2" timing="post" when="modified" status="check" command='find /etc/init.d -type f -iname "*ident2*" -delete'/>
|
||||
<Action name="kill-ident2" timing="post" when="modified" status="check" command="ps aux | grep ident2 | grep /usr/sbin|awk '{print $2}'|xargs -I {} -n 1 -t kill -9 {}"/>
|
||||
<Service type="deb" name="oidentd" status="on"/>
|
||||
</Rules>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue