From a9bdc305f438275ef5a262c541366c00fca6fcc7 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 30 Nov 2008 17:57:51 +0100 Subject: Add Skolelinux and CipUX DITs. --- ldap/README.dit | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/ldap/README.dit b/ldap/README.dit index 6077a57..cdc365f 100644 --- a/ldap/README.dit +++ b/ldap/README.dit @@ -22,6 +22,92 @@ dc=example,dc=com `-- cn=admin +Default Skolelinux DIT +---------------------- + +dc=skole,dc=skolelinux,dc=no +|-- ou=Attic +|-- ou=Machines +|-- ou=People +| `-- cn=Admin +|-- ou=Pam +|-- ou=Domains +|-- ou=Group +| |-- cn=Admins +| |-- cn=jradmins +| |-- cn=teachers +| |-- cn=students +| |-- cn=none +| `-- cn=machines +|-- ou=Netgroup +| |-- cn=all-hosts +| |-- cn=server-hosts +| |-- cn=ltsp-server-hosts +| |-- cn=workstation-hosts +| |-- cn=printer-hosts +| |-- cn=shutdown-at-night-hosts +| `-- cn=fsautoresize-hosts +|-- ou=Variables +| |-- cn=nextID +| `-- cn=capabilities +|-- ou=Automount +| |-- ou=auto.master +| | `-- cn=/skole +| `-- ou=skole +| |-- cn=tjener +| `-- ou=tjener +| `-- cn=home0 +|-- cn=dhcp +`-- cn=DHCP Config + |-- cn=INTERNAL + | |-- cn=10.0.2.0 + | `-- cn=group1 + | |-- cn=ltspserver00 + | |-- cn=ltspserver01 + | |-- cn=printer00 + | |-- cn=printer01 + | |-- cn=printer02 + | |-- cn=printer03 + | |-- cn=static00 + | |-- cn=static01 + | |-- cn=static02 + | `-- cn=static03 + `-- cn=THINCLIENTS + |-- cn=192.168.0.0 + `-- cn=group1 + |-- cn=ltsp010 + |-- cn=ltsp011 + |-- cn=ltsp012 + |-- cn=ltsp013 + |-- cn=ltsp014 + |-- cn=ltsp015 + |-- cn=ltsp016 + |-- cn=ltsp017 + |-- cn=ltsp018 + `-- cn=ltsp019 + + +Default CipUX DIT +----------------- + +ou=example org,dc=example,dc=org +|-- cn=cipuxadm +|-- ou=CipUX + |-- ou=User + | `-- uid=username + |-- ou=Group + | `-- cn=groupname + |-- ou=Task + |-- ou=CAT + |-- ou=Image + |-- ou=Machine + | `-- uid=win01$ + |-- ou=Room + |-- ou=HardwareType + |-- ou=ImageSlot + `-- ou=Configuration + + Simple DIT ---------- -- cgit v1.2.3 From eb98a94cb2373c5a2de1a728e764c1b88b4d4595 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 1 Dec 2008 10:32:47 +0100 Subject: Add a few more entries to Skolelinux DIT. --- ldap/README.dit | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldap/README.dit b/ldap/README.dit index cdc365f..fcd64c9 100644 --- a/ldap/README.dit +++ b/ldap/README.dit @@ -29,7 +29,9 @@ dc=skole,dc=skolelinux,dc=no |-- ou=Attic |-- ou=Machines |-- ou=People -| `-- cn=Admin +| |-- cn=Admin +| |-- cn=smbadmin +| `-- uid=root |-- ou=Pam |-- ou=Domains |-- ou=Group @@ -50,6 +52,7 @@ dc=skole,dc=skolelinux,dc=no |-- ou=Variables | |-- cn=nextID | `-- cn=capabilities +|-- sambaDomainName=SKOLELINUX |-- ou=Automount | |-- ou=auto.master | | `-- cn=/skole -- cgit v1.2.3 From 0f17fba5022a5b8cb8b74f312807cf755c59200c Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 1 Dec 2008 14:02:42 +0100 Subject: Add sample windows machine 'user' to Skolelinux DIT. --- ldap/README.dit | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ldap/README.dit b/ldap/README.dit index fcd64c9..e2c5e2f 100644 --- a/ldap/README.dit +++ b/ldap/README.dit @@ -29,6 +29,8 @@ dc=skole,dc=skolelinux,dc=no |-- ou=Attic |-- ou=Machines |-- ou=People +| |-- ou=Machines +| | `-- uid=win01$ | |-- cn=Admin | |-- cn=smbadmin | `-- uid=root -- cgit v1.2.3 From 533a8aba4b4f2184aa4ab786d219ced7034b64ab Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 2 Dec 2008 11:49:07 +0100 Subject: Fix bogusly base64'ed userPasswords. --- ldap/db/cipux_rolegroup.ldif.in | 2 +- ldap/db/cipux_roleuser.ldif.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ldap/db/cipux_rolegroup.ldif.in b/ldap/db/cipux_rolegroup.ldif.in index d6d3a9d..e974caf 100644 --- a/ldap/db/cipux_rolegroup.ldif.in +++ b/ldap/db/cipux_rolegroup.ldif.in @@ -17,4 +17,4 @@ objectClass: top objectClass: posixGroup objectClass: cipuxGroup structuralObjectClass: posixGroup -userPassword:: {crypt}x +userPassword: {crypt}x diff --git a/ldap/db/cipux_roleuser.ldif.in b/ldap/db/cipux_roleuser.ldif.in index 9a4fef8..c97e660 100644 --- a/ldap/db/cipux_roleuser.ldif.in +++ b/ldap/db/cipux_roleuser.ldif.in @@ -26,5 +26,5 @@ objectClass: imapUser objectClass: cipuxAccount uid: @ROLE@ uidNumber: @UID@ -userPassword:: {crypt}x +userPassword: {crypt}x structuralObjectClass: imapUser -- cgit v1.2.3 From fd74219680cb7750b225fe209b28dd3651dd68f2 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 14 Dec 2008 13:43:47 +0100 Subject: Fix org-centric Dit: People and System are Entities. --- ldap/README.dit | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ldap/README.dit b/ldap/README.dit index e2c5e2f..72e7e0b 100644 --- a/ldap/README.dit +++ b/ldap/README.dit @@ -159,10 +159,10 @@ dc=example,dc=com | |-- ou=Services | |-- ou=idMap | |-- ou=Entities -| |-- ou=System -| |-- ou=People -| |--cn=jonas -| `--cn=christian +| |-- ou=System +| `-- ou=People +| |--cn=jonas +| `--cn=christian `-- ou=Access Control |-- ou=Groups | `-- ou=Administrators -- cgit v1.2.3 From a90ae0e8460bfb43da87a6d296823a50a3e3f604 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 14 Dec 2008 17:09:23 +0100 Subject: Add exit1 function to mkldapdb. --- ldap/mkldapdb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ldap/mkldapdb b/ldap/mkldapdb index 77cb6d5..229abc9 100755 --- a/ldap/mkldapdb +++ b/ldap/mkldapdb @@ -15,11 +15,16 @@ fi # config defaults as of slapd 2.4.10-3 backend="hdb" +exit1() { + echo >&2 "Error: $1" + echo >&2 "Exiting..." + exit 1 +} + # Ensure all required values are properly resolved for var in basedn dnsdomain orgname backend; do if [ -z "`eval echo '$'$var`" ]; then - echo 1>&2 "ERROR: Required variable '$var' missing. Exiting...!" - exit 1 + exit1 "Required variable '$var' missing. Exiting...!" fi done -- cgit v1.2.3 From 2edca013de8ec1a6e32cff62fafe28383c291d6e Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 14 Dec 2008 17:21:23 +0100 Subject: Add getopt option parsing to mkldapdb. --- ldap/mkldapdb | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 92 insertions(+), 7 deletions(-) diff --git a/ldap/mkldapdb b/ldap/mkldapdb index 229abc9..8ae9f24 100755 --- a/ldap/mkldapdb +++ b/ldap/mkldapdb @@ -4,23 +4,108 @@ set -e umask 066 -# Resolve some defaults from other system config -basedn="`grep '^BASE\b' /etc/ldap/ldap.conf | sed -e 's/^BASE[[:space:]]\+//' -e 's/,[[:space:]]\+/,/g'`" -dnsdomain="`dnsdomainname`" -orgname="" -if [ -r /etc/local-ORG/orgname ]; then - orgname="$(head -n 1 /etc/local-ORG/orgname)" -fi +PRG=$(basename "$0") + +TEMP=$(getopt -s sh -o b:e:d:fh -l basedn:,enable:,disable:,force,help -n "$PRG" -- "$@") +if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi +eval set -- "$TEMP" + +getbasedn() { + grep '^BASE\b' /etc/ldap/ldap.conf | sed -e 's/^BASE[[:space:]]\+//' -e 's/,[[:space:]]\+/,/g' +} +getdnsdomain() { + dnsdomainname +} +getorgname() { + if [ -r /etc/local-ORG/orgname ]; then + head -n 1 /etc/local-ORG/orgname + fi +} # config defaults as of slapd 2.4.10-3 backend="hdb" +# extension default states (enabled/disabled) +cipux=1 +horde= + +# strings above, and either functions above or strings right below, +# can be overrided locally through this config file +if [ -f /etc/local/mkldapdb.cfg ]; then + . /etc/local/mkldapdb.cfg +fi + +basedn="${basedn:-$(getbasedn)}" +dnsdomain="${dnsdomain:-$(getdnsdomain)}" +orgname="${orgname:-$(getorgname)}" + +showhelp() { + cat <&2 "Error: $1" echo >&2 "Exiting..." exit 1 } +while true ; do + case "$1" in + -b|--basedn) basedn="$2"; shift 2;; + -e|--enable-extension) + case "$2" in + cipux|horde) eval "$2=1";; + *) exit1 "Unknown extension \"$2\"" + esac + shift 2 + ;; + -d|--disable-extension) + case "$2" in + cipux|horde) eval "$2=";; + *) exit1 "Unknown extension \"$2\"" + esac + shift 2 + ;; + -f|--force) force="1"; shift;; + -h|--help) showhelp; exit 0;; + --) shift; break;; + *) exit1 "Internal error!";; + esac +done + # Ensure all required values are properly resolved for var in basedn dnsdomain orgname backend; do if [ -z "`eval echo '$'$var`" ]; then -- cgit v1.2.3 From 5c38134be1197388e316bb0a17558560ef33a15c Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 15 Dec 2008 15:31:12 +0100 Subject: Add licensing header. Fix type. --- ldap/mkldapdb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ldap/mkldapdb b/ldap/mkldapdb index 8ae9f24..fbbdb09 100755 --- a/ldap/mkldapdb +++ b/ldap/mkldapdb @@ -1,4 +1,9 @@ #!/bin/sh +# +# /etc/local-COMMON/ldap/mkldapdb +# Copyright 2008 Jonas Smedegaard +# +# Setup LDAP database from skeleton files set -e @@ -145,7 +150,7 @@ spacecat $snippets | sed >>"$tempdir/slapd.conf" \ -e "s/@SUFFIX@/$basedn/g" \ -e "s/@ADMIN@/cn=admin,$basedn/g" -# TODO: Better separate core from normal lif files than "below 100"... +# TODO: Better separate core from normal ldif files than "below 100"... file=99 for section in core base cipux horde; do sed <"$masterdir/db/$section.ldif.in" >"$tempdir/${file}_$section.ldif" \ -- cgit v1.2.3 From 0e86e9149f814cdb30fb5db0f1a1b8bb6d2b6ea3 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 4 Mar 2009 17:45:05 +0100 Subject: Add rsyslog config snippets to use TLS. --- rsyslog.d/local-gtls-client.conf | 6 ++++++ rsyslog.d/local-gtls-server.conf | 5 +++++ rsyslog.d/local-gtls.conf | 21 +++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 rsyslog.d/local-gtls-client.conf create mode 100644 rsyslog.d/local-gtls-server.conf create mode 100644 rsyslog.d/local-gtls.conf diff --git a/rsyslog.d/local-gtls-client.conf b/rsyslog.d/local-gtls-client.conf new file mode 100644 index 0000000..e692b07 --- /dev/null +++ b/rsyslog.d/local-gtls-client.conf @@ -0,0 +1,6 @@ +# restrict access based on server certificate +# (repeat all lines for each server) +#$ActionSendStreamDriverAuthMode x509/name +#$ActionSendStreamDriverMode 1 # run driver in TLS-only mode +#$ActionSendStreamDriverPermittedPeer central.example.net +#*.* @@central.example.net:514 # forward everything to remote server diff --git a/rsyslog.d/local-gtls-server.conf b/rsyslog.d/local-gtls-server.conf new file mode 100644 index 0000000..b17d55a --- /dev/null +++ b/rsyslog.d/local-gtls-server.conf @@ -0,0 +1,5 @@ +# enable gtls reception +$InputTCPServerRun 514 + +# restrict access based on client certificate +#$InputTCPServerStreamDriverPermittedPeer *.example.net diff --git a/rsyslog.d/local-gtls.conf b/rsyslog.d/local-gtls.conf new file mode 100644 index 0000000..aef8117 --- /dev/null +++ b/rsyslog.d/local-gtls.conf @@ -0,0 +1,21 @@ +# enable gtls driver and make it the default +$ModLoad imtcp +$DefaultNetstreamDriver gtls + +# certificate files +$DefaultNetstreamDriverCAFile /etc/ssl/certs/ca-certificates.crt +$DefaultNetstreamDriverCertFile /etc/ssl/certs/rsyslog.pem +$DefaultNetstreamDriverKeyFile /etc/ssl/private/rsyslog.pem + +$InputTCPServerStreamDriverAuthMode x509/name +$InputTCPServerStreamDriverMode 1 # run driver in TLS-only mode + +# sample reception (repeat last line for each client) +#$InputTCPServerRun 514 +#$InputTCPServerStreamDriverPermittedPeer *.example.net + +# sample sending (repeat all lines for each server) +#$ActionSendStreamDriverAuthMode x509/name +#$ActionSendStreamDriverMode 1 # run driver in TLS-only mode +#$ActionSendStreamDriverPermittedPeer central.example.net +#*.* @@central.example.net:514 # forward everything to remote server -- cgit v1.2.3 From 685f630a421c28e0f1863f9386c43b55fac36a8e Mon Sep 17 00:00:00 2001 From: root Date: Wed, 4 Mar 2009 20:03:11 +0100 Subject: Rename rsyslog config snippets for proper load ordering. --- rsyslog.d/local-gtls-client.conf | 6 ------ rsyslog.d/local-gtls-common.conf | 21 +++++++++++++++++++++ rsyslog.d/local-gtls-receive.conf | 5 +++++ rsyslog.d/local-gtls-send.conf | 6 ++++++ rsyslog.d/local-gtls-server.conf | 5 ----- rsyslog.d/local-gtls.conf | 21 --------------------- 6 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 rsyslog.d/local-gtls-client.conf create mode 100644 rsyslog.d/local-gtls-common.conf create mode 100644 rsyslog.d/local-gtls-receive.conf create mode 100644 rsyslog.d/local-gtls-send.conf delete mode 100644 rsyslog.d/local-gtls-server.conf delete mode 100644 rsyslog.d/local-gtls.conf diff --git a/rsyslog.d/local-gtls-client.conf b/rsyslog.d/local-gtls-client.conf deleted file mode 100644 index e692b07..0000000 --- a/rsyslog.d/local-gtls-client.conf +++ /dev/null @@ -1,6 +0,0 @@ -# restrict access based on server certificate -# (repeat all lines for each server) -#$ActionSendStreamDriverAuthMode x509/name -#$ActionSendStreamDriverMode 1 # run driver in TLS-only mode -#$ActionSendStreamDriverPermittedPeer central.example.net -#*.* @@central.example.net:514 # forward everything to remote server diff --git a/rsyslog.d/local-gtls-common.conf b/rsyslog.d/local-gtls-common.conf new file mode 100644 index 0000000..aef8117 --- /dev/null +++ b/rsyslog.d/local-gtls-common.conf @@ -0,0 +1,21 @@ +# enable gtls driver and make it the default +$ModLoad imtcp +$DefaultNetstreamDriver gtls + +# certificate files +$DefaultNetstreamDriverCAFile /etc/ssl/certs/ca-certificates.crt +$DefaultNetstreamDriverCertFile /etc/ssl/certs/rsyslog.pem +$DefaultNetstreamDriverKeyFile /etc/ssl/private/rsyslog.pem + +$InputTCPServerStreamDriverAuthMode x509/name +$InputTCPServerStreamDriverMode 1 # run driver in TLS-only mode + +# sample reception (repeat last line for each client) +#$InputTCPServerRun 514 +#$InputTCPServerStreamDriverPermittedPeer *.example.net + +# sample sending (repeat all lines for each server) +#$ActionSendStreamDriverAuthMode x509/name +#$ActionSendStreamDriverMode 1 # run driver in TLS-only mode +#$ActionSendStreamDriverPermittedPeer central.example.net +#*.* @@central.example.net:514 # forward everything to remote server diff --git a/rsyslog.d/local-gtls-receive.conf b/rsyslog.d/local-gtls-receive.conf new file mode 100644 index 0000000..b17d55a --- /dev/null +++ b/rsyslog.d/local-gtls-receive.conf @@ -0,0 +1,5 @@ +# enable gtls reception +$InputTCPServerRun 514 + +# restrict access based on client certificate +#$InputTCPServerStreamDriverPermittedPeer *.example.net diff --git a/rsyslog.d/local-gtls-send.conf b/rsyslog.d/local-gtls-send.conf new file mode 100644 index 0000000..e692b07 --- /dev/null +++ b/rsyslog.d/local-gtls-send.conf @@ -0,0 +1,6 @@ +# restrict access based on server certificate +# (repeat all lines for each server) +#$ActionSendStreamDriverAuthMode x509/name +#$ActionSendStreamDriverMode 1 # run driver in TLS-only mode +#$ActionSendStreamDriverPermittedPeer central.example.net +#*.* @@central.example.net:514 # forward everything to remote server diff --git a/rsyslog.d/local-gtls-server.conf b/rsyslog.d/local-gtls-server.conf deleted file mode 100644 index b17d55a..0000000 --- a/rsyslog.d/local-gtls-server.conf +++ /dev/null @@ -1,5 +0,0 @@ -# enable gtls reception -$InputTCPServerRun 514 - -# restrict access based on client certificate -#$InputTCPServerStreamDriverPermittedPeer *.example.net diff --git a/rsyslog.d/local-gtls.conf b/rsyslog.d/local-gtls.conf deleted file mode 100644 index aef8117..0000000 --- a/rsyslog.d/local-gtls.conf +++ /dev/null @@ -1,21 +0,0 @@ -# enable gtls driver and make it the default -$ModLoad imtcp -$DefaultNetstreamDriver gtls - -# certificate files -$DefaultNetstreamDriverCAFile /etc/ssl/certs/ca-certificates.crt -$DefaultNetstreamDriverCertFile /etc/ssl/certs/rsyslog.pem -$DefaultNetstreamDriverKeyFile /etc/ssl/private/rsyslog.pem - -$InputTCPServerStreamDriverAuthMode x509/name -$InputTCPServerStreamDriverMode 1 # run driver in TLS-only mode - -# sample reception (repeat last line for each client) -#$InputTCPServerRun 514 -#$InputTCPServerStreamDriverPermittedPeer *.example.net - -# sample sending (repeat all lines for each server) -#$ActionSendStreamDriverAuthMode x509/name -#$ActionSendStreamDriverMode 1 # run driver in TLS-only mode -#$ActionSendStreamDriverPermittedPeer central.example.net -#*.* @@central.example.net:514 # forward everything to remote server -- cgit v1.2.3 From a9cce00e972be02850d74f3681f4993a00bed0fd Mon Sep 17 00:00:00 2001 From: root Date: Wed, 11 Mar 2009 13:11:53 +0100 Subject: Add custom Midnight Commander mc) menu file. --- mc/mc.menu | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 mc/mc.menu diff --git a/mc/mc.menu b/mc/mc.menu new file mode 100644 index 0000000..2e7be79 --- /dev/null +++ b/mc/mc.menu @@ -0,0 +1,166 @@ +shell_patterns=0 += t d +3 Compress the current subdirectory (tar.gz) + Pwd=`basename %d /` + echo -n "Name of the compressed file (without extension) [$Pwd]: " + read tar + if [ "$tar"x = x ]; then tar="$Pwd"; fi + cd .. && \ + tar cf - "$Pwd" | gzip -f9 > "$tar.tar.gz" && \ + echo "../$tar.tar.gz created." + +4 Compress the current subdirectory (tar.bz2) + Pwd=`basename %d /` + echo -n "Name of the compressed file (without extension) [$Pwd]: " + read tar + if [ "$tar"x = x ]; then tar="$Pwd"; fi + cd .. && \ + tar cf - "$Pwd" | bzip2 -f > "$tar.tar.bz2" && \ + echo "../$tar.tar.bz2 created." + +=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.Z$| f \.tar\.bz2$ & t r +x Extract the contents of a compressed tar file + unset EXT + case %f in + *.tar.bz2) EXT=tar_bz2;; + esac + if [ "$EXT" = "tar_bz2" ]; then + bunzip2 -c %f | tar xvf - + else + gzip -dc %f | tar xvf - + fi + += t r ++ ! t t +y Gzip or gunzip current file + unset DECOMP + case %f in + *.gz) DECOMP=-d;; + *.[zZ]) DECOMP=-d;; + esac + gzip $DECOMP -v %f + ++ t t +Y Gzip or gunzip tagged files + for i in %t + do + unset DECOMP + case $i in + *.gz) DECOMP=-d;; + *.[zZ]) DECOMP=-d;; + esac + gzip $DECOMP -v $i + done + ++ ! t t +b Bzip2 or bunzip2 current file + unset DECOMP + case %f in + *.bz2) DECOMP=-d;; + esac + bzip2 $DECOMP -v %f + ++ t t +B Bzip2 or bunzip2 tagged files + for i in %t + do + unset DECOMP + case $i in + *.bz2) DECOMP=-d;; + esac + bzip2 $DECOMP -v $i + done + ++ f \.tar.gz$ | f \.tgz$ | f \.tpz$ | f \.tar.Z$ | f \.tar.z$ | f \.tar.bz2$ | f \.tar.F$ & t r & ! t t +z Extract compressed tar file to subdirectory + unset D + set gzip -cd + case %f in + *.tar.gz) D="`basename %f .tar.gz`";; + *.tgz) D="`basename %f .tgz`";; + *.tpz) D="`basename %f .tpz`";; + *.tar.Z) D="`basename %f .tar.Z`";; + *.tar.z) D="`basename %f .tar.z`";; + *.tar.bz2) D="`basename %f .tar.bz2`"; set bunzip2 -c ;; + *.tar.F) D="`basename %f .tar.F`"; set freeze -dc; + esac + mkdir $D; cd $D && ($1 $2 ../%f | tar xvf -) + ++ t t +Z Extract compressed tar files to subdirectories + for i in %t + do + set gzip -dc + unset D + case $i in + *.tar.gz) D="`basename $i .tar.gz`";; + *.tgz) D="`basename $i .tgz`";; + *.tpz) D="`basename $i .tpz`";; + *.tar.Z) D="`basename $i .tar.Z`";; + *.tar.z) D="`basename $i .tar.z`";; + *.tar.F) D="`basename $i .tar.F`"; set freeze -dc;; + *.tar.bz2) D="`basename $i .tar.bz2`"; set bunzip2 -c;; + esac + mkdir $D; (cd $D && $1 $2 ../$i | tar xvf -) + done + ++ f \.gz$ | f \.tgz$ | f \.tpz$ | f \.Z$ | f \.z$ | f \.bz2$ & t r & ! t t +c Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2 + unset D + unset EXT + case %f in + *.tgz) EXT=tgz;; + *.tpz) EXT=tpz;; + *.Z) EXT=Z;; + *.z) EXT=z;; + *.gz) EXT=gz;; + *.bz2) EXT=bz2;; + esac + case $EXT in + tgz|tpz) D="`basename %f .$EXT`.tar";; + gz|Z|z) D="`basename %f .$EXT`";; + bz2) D="`basename %f .bz2`";; + esac + if [ "$EXT" = "bz2" ]; then + bunzip2 -v %f ; gzip -f9 -v $D + else + gunzip -v %f ; bzip2 -v $D + fi + ++ t t +C Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2 + set %t + while [ -n "$1" ] + do + unset D + unset EXT + case $1 in + *.tgz) EXT=tgz;; + *.tpz) EXT=tpz;; + *.Z) EXT=Z;; + *.z) EXT=z;; + *.gz) EXT=gz;; + *.bz2) EXT=bz2;; + esac + case $EXT in + tgz) D="`basename $1 .tgz`.tar";; + tpz) D="`basename $1 .tpz`.tar";; + gz|Z|z) D="`basename $1 .$EXT`";; + bz2) D="`basename $1 .bz2`";; + esac + if [ "$EXT" = "bz2" ]; then + bunzip2 -v $1 + gzip -f9 -v $D + else + gunzip -v $1 + bzip2 -v $D + fi + shift + done + ++ F \.tar\.gz$ | F \.tar\.bz2$ & ! T T +t git-import-orig current file in opposite dir + git-import-orig --pristine-tar --sign-tags %D/%F + +c Create unofficial changelog entry + dch -D jonas -l ~0jones --force-distribution "Unofficial build based on Debian Sid packaging." -- cgit v1.2.3 From 558fc7d7cca2df4fd5d68148ccd8bf0f21e4f968 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 18 Apr 2009 01:57:58 +0200 Subject: Drop superfluous URxvt lines. Add boldFont, saveLines and transparency lines. --- X11/Xresources/local | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/X11/Xresources/local b/X11/Xresources/local index 2d45ceb..de16acf 100644 --- a/X11/Xresources/local +++ b/X11/Xresources/local @@ -1,10 +1,24 @@ ! /etc/X11/Xresources/local XTerm*font: terminus-24 +XTerm*boldFont: terminus-bold-24 Rxvt*font: terminus-24 -URxvt*font: terminus-24 +Rxvt*boldFont: terminus-bold-24 + XTerm*reverseVideo: True Rxvt*reverseVideo: True -URxvt*reverseVideo: True + Rxvt*scrollBar: False -URxvt*scrollBar: False +Rxvt*saveLines: 500 + +! enable pseudo-transparency +Rxvt*color9: #ff5555 +Rxvt*color10: #55ff55 +Rxvt*color11: #ffff55 +Rxvt*color12: #5555ff +Rxvt*color13: #ff55ff +Rxvt*color14: #55ffff +Rxvt*color15: #ffffff +Rxvt*inheritPixmap: True +Rxvt*shading: 15 +Rxvt*tintColor: white -- cgit v1.2.3 From fff01fe0db15da361ca8579b4aebfa009f77e9e4 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 7 May 2009 12:37:19 +0200 Subject: Locate more trash mail to purge. --- postfix/cron.weekky/local-purgeoldtrashedmails | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postfix/cron.weekky/local-purgeoldtrashedmails b/postfix/cron.weekky/local-purgeoldtrashedmails index 205585b..7674508 100755 --- a/postfix/cron.weekky/local-purgeoldtrashedmails +++ b/postfix/cron.weekky/local-purgeoldtrashedmails @@ -4,6 +4,6 @@ set -e -find /home/*/Maildir/.Trash /home/*/Maildir/.trash /home/*/Maildir/.Deleted\ Messages /home/*/Maildir/.Deleted\ Items -type f -mtime +60 -exec rm -f '{}' ';' +find /home/*/Maildir/.Trash /home/*/Maildir/.Trash.* /home/*/Maildir/.INBOX_Trash /home/*/Maildir/.trash /home/*/Maildir/.Deleted\ Messages /home/*/Maildir/.Deleted\ Items /home/*/Maildir/.Slettet\ post -type f -mtime +60 -exec rm -f '{}' ';' exit 0 -- cgit v1.2.3 From 5c77354ed123874f634332042dd2074d955d6818 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 7 May 2009 12:38:28 +0200 Subject: Fix typo in dirname: cron.weekky → cron.weekly. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- postfix/cron.weekky/local-purgeoldtrashedmails | 9 --------- postfix/cron.weekly/local-purgeoldtrashedmails | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100755 postfix/cron.weekky/local-purgeoldtrashedmails create mode 100755 postfix/cron.weekly/local-purgeoldtrashedmails diff --git a/postfix/cron.weekky/local-purgeoldtrashedmails b/postfix/cron.weekky/local-purgeoldtrashedmails deleted file mode 100755 index 7674508..0000000 --- a/postfix/cron.weekky/local-purgeoldtrashedmails +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# Purge trashed mails older than 2 months - -set -e - -find /home/*/Maildir/.Trash /home/*/Maildir/.Trash.* /home/*/Maildir/.INBOX_Trash /home/*/Maildir/.trash /home/*/Maildir/.Deleted\ Messages /home/*/Maildir/.Deleted\ Items /home/*/Maildir/.Slettet\ post -type f -mtime +60 -exec rm -f '{}' ';' - -exit 0 diff --git a/postfix/cron.weekly/local-purgeoldtrashedmails b/postfix/cron.weekly/local-purgeoldtrashedmails new file mode 100755 index 0000000..7674508 --- /dev/null +++ b/postfix/cron.weekly/local-purgeoldtrashedmails @@ -0,0 +1,9 @@ +#!/bin/sh +# +# Purge trashed mails older than 2 months + +set -e + +find /home/*/Maildir/.Trash /home/*/Maildir/.Trash.* /home/*/Maildir/.INBOX_Trash /home/*/Maildir/.trash /home/*/Maildir/.Deleted\ Messages /home/*/Maildir/.Deleted\ Items /home/*/Maildir/.Slettet\ post -type f -mtime +60 -exec rm -f '{}' ';' + +exit 0 -- cgit v1.2.3 From 8fdac675ccd4c36f4af6e8fdc01627ea89fd718a Mon Sep 17 00:00:00 2001 From: root Date: Thu, 7 May 2009 12:41:32 +0200 Subject: Update path to dkimproxy-sign (changed in dkimproxy 1.0.1-8.1). --- postfix/postfix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postfix/postfix.sh b/postfix/postfix.sh index 2b923e0..102b8dc 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -66,7 +66,7 @@ else fi dkimproxy= -if [ "1" = "$amavis" ] && [ -x /usr/bin/dkimsign ]; then +if [ "1" = "$amavis" ] && [ -x /usr/bin/dkimproxy-sign ]; then dkimproxy=1 else echo >&2 "WARNING: Avoiding/disabling DKIMproxy setup: not installed." -- cgit v1.2.3 From 200ea45370f5d6bf70b7185885a2c740a48b0f43 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 7 May 2009 13:07:09 +0200 Subject: Enable bogusmx.rfc-ignorant.org. --- postfix/reject_rhsbl_sender | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postfix/reject_rhsbl_sender b/postfix/reject_rhsbl_sender index 5d7933d..04ef383 100644 --- a/postfix/reject_rhsbl_sender +++ b/postfix/reject_rhsbl_sender @@ -10,7 +10,7 @@ # $Id: reject_rhsbl_sender,v 1.5 2008-05-25 15:31:28 jonas Exp $ # -#bogusmx.rfc-ignorant.org # Disable for now - claims redpill domains "has demonstrably bogus MX record" +bogusmx.rfc-ignorant.org dsn.rfc-ignorant.org block.rhs.mailpolice.com dob.sibl.support-intelligence.net # newly registered domains: http://www.support-intelligence.com/dob/ -- cgit v1.2.3 From 37f949dc3927dd3f24fd03f45e80de776ec2868e Mon Sep 17 00:00:00 2001 From: root Date: Thu, 7 May 2009 13:14:11 +0200 Subject: Add virbl.dnsbl.bit.nl. Fix use zen.spamhaus.org (not zen.spamhaus.net). --- postfix/maps_rbl_domains | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/postfix/maps_rbl_domains b/postfix/maps_rbl_domains index b2e15b0..03ed016 100644 --- a/postfix/maps_rbl_domains +++ b/postfix/maps_rbl_domains @@ -23,5 +23,6 @@ # Great RBL blog: http://www.dnsbl.com/ # Automated RBL comparison: http://stats.dnsbl.com/ -zen.spamhaus.net # Recommended at http://www.dnsbl.com/ +virbl.dnsbl.bit.nl # Virbl-project +zen.spamhaus.org # Recommended at http://www.dnsbl.com/ bl.spamcop.net # Avoided in the past, but now recommended: http://www.dnsbl.com/2007/05/spamcop-bl-another-look-its-accurate.html -- cgit v1.2.3