diff options
| l--------- | debian/itzks-systems-diskless.fetch-filter-cert.init | 1 | ||||
| -rw-r--r-- | debian/itzks-systems-diskless.maintscript | 1 | ||||
| -rwxr-xr-x | debian/itzks-systems-diskless.preinst | 39 | ||||
| l--------- | debian/itzks-systems-terminalserver.fetch-filter-cert.init | 1 | ||||
| -rw-r--r-- | debian/itzks-systems-terminalserver.maintscript | 1 | ||||
| -rwxr-xr-x | debian/itzks-systems-terminalserver.preinst | 39 | ||||
| l--------- | debian/itzks-systems-workstation.fetch-filter-cert.init | 1 | ||||
| -rw-r--r-- | debian/itzks-systems-workstation.maintscript | 1 | ||||
| -rwxr-xr-x | debian/itzks-systems-workstation.preinst | 39 | ||||
| -rwxr-xr-x | etc/init.d/fetch-filter-cert | 80 | 
10 files changed, 120 insertions, 83 deletions
diff --git a/debian/itzks-systems-diskless.fetch-filter-cert.init b/debian/itzks-systems-diskless.fetch-filter-cert.init deleted file mode 120000 index 048dfd5..0000000 --- a/debian/itzks-systems-diskless.fetch-filter-cert.init +++ /dev/null @@ -1 +0,0 @@ -../etc/init.d/fetch-filter-cert
\ No newline at end of file diff --git a/debian/itzks-systems-diskless.maintscript b/debian/itzks-systems-diskless.maintscript new file mode 100644 index 0000000..905772a --- /dev/null +++ b/debian/itzks-systems-diskless.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/init.d/fetch-filter-cert 2022.01.07.1~ diff --git a/debian/itzks-systems-diskless.preinst b/debian/itzks-systems-diskless.preinst new file mode 100755 index 0000000..e9d02f5 --- /dev/null +++ b/debian/itzks-systems-diskless.preinst @@ -0,0 +1,39 @@ +#!/bin/sh +# preinst script for itzks-systems-diskless +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +#        * <postinst> `configure' <most-recently-configured-version> +#        * <old-postinst> `abort-upgrade' <new version> +#        * <conflictor's-postinst> `abort-remove' `in-favour' <package> +#          <new-version> +#        * <postinst> `abort-remove' +#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +#          <failed-install-package> <version> `removing' +#          <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in +	install|upgrade) +		if dpkg --compare-versions "$2" lt "2022.01.07.1~"; then +			update-rc.d fetch-filter-cert remove >/dev/null || exit $? +		fi +		;; +	abort-upgrade) +		;; +	*) +		echo "preinst called with unknown argument \`$1'" >&2 +		exit 1 +		;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/itzks-systems-terminalserver.fetch-filter-cert.init b/debian/itzks-systems-terminalserver.fetch-filter-cert.init deleted file mode 120000 index 048dfd5..0000000 --- a/debian/itzks-systems-terminalserver.fetch-filter-cert.init +++ /dev/null @@ -1 +0,0 @@ -../etc/init.d/fetch-filter-cert
\ No newline at end of file diff --git a/debian/itzks-systems-terminalserver.maintscript b/debian/itzks-systems-terminalserver.maintscript new file mode 100644 index 0000000..905772a --- /dev/null +++ b/debian/itzks-systems-terminalserver.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/init.d/fetch-filter-cert 2022.01.07.1~ diff --git a/debian/itzks-systems-terminalserver.preinst b/debian/itzks-systems-terminalserver.preinst new file mode 100755 index 0000000..9ce101e --- /dev/null +++ b/debian/itzks-systems-terminalserver.preinst @@ -0,0 +1,39 @@ +#!/bin/sh +# preinst script for itzks-systems-terminalserver +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +#        * <postinst> `configure' <most-recently-configured-version> +#        * <old-postinst> `abort-upgrade' <new version> +#        * <conflictor's-postinst> `abort-remove' `in-favour' <package> +#          <new-version> +#        * <postinst> `abort-remove' +#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +#          <failed-install-package> <version> `removing' +#          <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in +	install|upgrade) +		if dpkg --compare-versions "$2" lt "2022.01.07.1~"; then +			update-rc.d fetch-filter-cert remove >/dev/null || exit $? +		fi +		;; +	abort-upgrade) +		;; +	*) +		echo "preinst called with unknown argument \`$1'" >&2 +		exit 1 +		;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/itzks-systems-workstation.fetch-filter-cert.init b/debian/itzks-systems-workstation.fetch-filter-cert.init deleted file mode 120000 index 048dfd5..0000000 --- a/debian/itzks-systems-workstation.fetch-filter-cert.init +++ /dev/null @@ -1 +0,0 @@ -../etc/init.d/fetch-filter-cert
\ No newline at end of file diff --git a/debian/itzks-systems-workstation.maintscript b/debian/itzks-systems-workstation.maintscript index 0b1adf0..e8df472 100644 --- a/debian/itzks-systems-workstation.maintscript +++ b/debian/itzks-systems-workstation.maintscript @@ -5,3 +5,4 @@ rm_conffile /etc/skel/Desktop/Netzwerkordner.desktop 2020.02.10.2~  rm_conffile /etc/skel/Desktop/pwdchange.desktop 2020.02.10.2~  rm_conffile /etc/skel/.mozilla/firefox/debian-edu.default/pkcs11.txt 2020.02.10.2~  rm_conffile /etc/skel/.pki/nssdb/pkcs11.txt 2020.02.10.2~ +rm_conffile /etc/init.d/fetch-filter-cert 2022.01.07.1~ diff --git a/debian/itzks-systems-workstation.preinst b/debian/itzks-systems-workstation.preinst new file mode 100755 index 0000000..b0c4693 --- /dev/null +++ b/debian/itzks-systems-workstation.preinst @@ -0,0 +1,39 @@ +#!/bin/sh +# preinst script for itzks-systems-workstation +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +#        * <postinst> `configure' <most-recently-configured-version> +#        * <old-postinst> `abort-upgrade' <new version> +#        * <conflictor's-postinst> `abort-remove' `in-favour' <package> +#          <new-version> +#        * <postinst> `abort-remove' +#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +#          <failed-install-package> <version> `removing' +#          <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in +	install|upgrade) +		if dpkg --compare-versions "$2" lt "2022.01.07.1~"; then +			update-rc.d fetch-filter-cert remove >/dev/null || exit $? +		fi +		;; +	abort-upgrade) +		;; +	*) +		echo "preinst called with unknown argument \`$1'" >&2 +		exit 1 +		;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/etc/init.d/fetch-filter-cert b/etc/init.d/fetch-filter-cert deleted file mode 100755 index 13bb264..0000000 --- a/etc/init.d/fetch-filter-cert +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides:          fetch-filter-cert -# Required-Start:    $local_fs $remote_fs -# Required-Stop:     $local_fs $remote_fs -# Should-Start:      $network $syslog $named -# Default-Start:     2 3 4 5 -# Default-Stop: -# Short-Description: Fetch e2guardian SSL public cacert -# Description: -#   Retrieve e2guardian proxy's CA certificate and add it to -#   the system-wide list of CA certificates. -### END INIT INFO - -set -e - -. /lib/lsb/init-functions - -CERTFILE=/usr/local/share/ca-certificates/debian-edu/filter-ca.crt -FILTERSERVER="filter" -FILTERCACERTURL="http://$FILTERSERVER/filter-ca.crt" - -do_start() { -    ERROR=false -    if ! fping "$FILTERSERVER" 1>/dev/null 2>/dev/null; then -	    logger -t fetch-filter-cert "Site does not have a content filter server, aborting." -	    return 0 -    elif [ ! -f $CERTFILE ]; then -	[ "$VERBOSE" != no ] && log_action_begin_msg "Fetching content filter CA certificate." -	mkdir -p "$(dirname $CERTFILE)" -	curl "$FILTERCACERTURL" > $CERTFILE.new -	chmod 644 $CERTFILE.new -	if test -s $CERTFILE.new && head -n1 $CERTFILE.new | grep -q -E '^-----BEGIN CERTIFICATE-----$'; then -	    mv $CERTFILE.new $CERTFILE -	    [ "$VERBOSE" != no ] && log_action_end_msg 0 -	    logger -t fetch-filter-cert "Fetched content filter CA certificate from $FILTERCACERTURL." -	    update-ca-certificates 1>/dev/null -	else -	    rm $CERTFILE.new -	    log_action_end_msg 1 -	    logger -t fetch-filter-cert "Failed to fetch content filter CA certificate from $FILTERCACERTURL." -	    ERROR=true -	fi -    fi -    if [ -d /opt/ltsp ] ; then -	for ltsp_chroot in `find /opt/ltsp/ -mindepth 1 -maxdepth 1 -type d`; do -	    if [ ! -f $ltsp_chroot$CERTFILE ]; then -		[ "$VERBOSE" != no ] &&  -		log_action_begin_msg "Copying content filter CA certificate to ltsp-chroot $ltsp_chroot " -		if test -s $CERTFILE; then -	            mkdir -p $(dirname $ltsp_chroot/$CERTFILE) -		    cp $CERTFILE $ltsp_chroot$CERTFILE -		    chmod 644 $ltsp_chroot$CERTFILE -		    chroot $ltsp_chroot update-ca-certificates 1>/dev/null -		    [ "$VERBOSE" != no ] && log_action_end_msg 0 -		else -		    log_action_end_msg 1 -		    ERROR=true -		fi -	    fi -	done -    fi -    if $ERROR; then -	return 1 -    fi -} - -case "$1" in -    start) -	do_start -	;; -    stop) -	;; -    restart|force-reload) -	;; -    *) -	echo "Usage: $0 {start|stop|restart|force-reload}" -	exit 2 -esac -exit 0  | 
