Fix syntax error

git-svn-id: file:///svn/tfheen/trunk/dotfiles@1237 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/emacs b/emacs
index ce4e3e5bd73c4f7f125d017db12b659ebec24945..b306ca1fadda1ab5888a4f008593521b428a2a50 100644 (file)
--- a/emacs
+++ b/emacs
@@ -330,7 +330,7 @@
        org-agenda-include-diary t
        org-agenda-include-all-todo t
        org-tags-column (* -1 (- (frame-width) 10)
-       org-agenda-align-tags-to-column (- (frame-width) 10)))
+       org-agenda-align-tags-to-column (- (frame-width) 10))))
 
  (eval-after-load 'remember
    '(add-hook 'remember-mode-hook 'org-remember-apply-template))

diff --git a/gnus b/gnus
index 593b3ac294c4a36a2ef2a089aaae7123372b1925..102a060e92fb0f1d732ee0094f823b4306b67461 100644 (file)
--- a/gnus
+++ b/gnus
@@ -67,10 +67,19 @@
                                    (nnimap-server-port 993)
                                    (nnimap-stream ssl)
                                     (nnimap-authinfo-file "~/.imap-authinfo")))
-  (add-to-list 'gnus-secondary-select-methods '(nntp "nntp.linpro.no"
-                                                    (nntp-port-number 563)
-                                                    (nntp-open-connection-function nntp-open-ssl-stream))))
+;  (add-to-list 'gnus-secondary-select-methods '(nntp "nntp.linpro.no"
+;                                                   (nntp-address "login.linpro.no")
+;                                                   (nntp-open-connection-function nntp-open-rlogin)
+;                                                   (nntp-end-of-line "\n")
+;                                                   (nntp-rlogin-parameters
+;                                                    ("telnet" "nntp.linpro.no" "nntp"))))
+  (add-to-list 'gnus-secondary-select-methods '(nnimap "mail.err.no"
+                                                      (nnimap-stream shell)))
+  (add-to-list 'gnus-secondary-select-methods '(nnimap "imap.oslo.dnmi.no"))
 
+  (setq imap-shell-program
+       '("ssh -ax -C -oBatchMode=yes vuizook.err.no 'exec env MAIL=$HOME/Maildir /usr/lib/dovecot/imap'")
+       nntp-rlogin-program "ssh"))
 
 (cw/for-host "vawad"
   (setq gnus-select-method '(nnimap "raw"

diff --git a/muttrc b/muttrc
index 12df805eb316c4675379f80e229e8f11cf4f8ab0..ab1520ac917139d58fb44d1c6c42ac4c534576b0 100644 (file)
--- a/muttrc
+++ b/muttrc
@@ -6,8 +6,8 @@ set realname="Tollef Fog Heen"
 set use_from
 set edit_hdrs
 set move=no
-set spoolfile="imaps://mail.raw.no/in-`date +%Y-%m`"
-set folder=imaps://mail.raw.no/
+set spoolfile="imap://tollef@dev-vm122/in-`date +%Y-%m`"
+set folder=imap://tollef@dev-vm122/
 set record="imaps://mail.raw.no/out.`date +%Y`.out-`date +%Y-%m`"
 set copy 
 fcc-hook "-t imap_domain_name" imaps://mail.raw.no/out.`date +%Y`.out-`date +%Y-%m`

diff --git a/ssh/config b/ssh/config
index b8a4c96f76816a7de9097c1decc1759b97ac0336..fecfdc0c6caea6feeea3d2c5ccec41ec12196057 100644 (file)
--- a/ssh/config
+++ b/ssh/config
@@ -116,16 +116,24 @@ Hostname vojei.err.no
 HostKeyAlias vojei.err.no
 CheckHostIP no
 
-# Canonical
+Host *.luftfartstilsynet.kunder.linpro.no
+ProxyCommand ssh -q -a -x login.linpro.no nc -q0 %h 22
+User root
+
+Host *.sommerskole.kunder.linpro.no
+User root
 
-Host humboldt.ubuntu.com
-ProxyCommand none
+Host poff.linpro.no
+ProxyCommand ssh -q -a -x false.linpro.no nc -q0 %h 22
 
-Host chinstrap.ubuntu.com
-ProxyCommand none
+Host *.kurs.linpro.no
+ProxyCommand ssh -q -a -x poff.linpro.no nc -q0 %h 22
+User root
 
-Host *.ubuntu.com
-ProxyCommand ssh -q -a -x chinstrap.ubuntu.com nc -q0 %h 22
+Host curie
+ProxyCommand ssh -q -a -x -l tore webadmin.netcom.no nc -q0 %h 22
+User root
 
-Host *.kunder.linpro.no
-ProxyCommand ssh -q -a -x login.linpro.no nc -q0 %h 22
+Host feynman.netcom.no
+ProxyCommand ssh -t  -q -a -x curie ssh -t -v4 %h %p
+User root