Update of /project/lisppaste/cvsroot/lisppaste2 In directory common-lisp.net:/home/bmastenbrook/lisppaste2

Modified Files: irc-log-link.lisp variable.lisp Log Message: Conditionalize meme links

Date: Wed Feb 4 08:11:23 2004 Author: bmastenbrook

Index: lisppaste2/irc-log-link.lisp diff -u lisppaste2/irc-log-link.lisp:1.3 lisppaste2/irc-log-link.lisp:1.4 --- lisppaste2/irc-log-link.lisp:1.3 Wed Feb 4 08:07:27 2004 +++ lisppaste2/irc-log-link.lisp Wed Feb 4 08:11:22 2004 @@ -58,7 +58,8 @@ (return-from log-return nil)))))

(defun irc-log-link (channel) - (let ((link (fetch-irc-log-link (string-left-trim "#" channel)))) - (if (stringp link) - (araneida:urlstring (araneida:merge-url (araneida:make-url :scheme "http" :host *meme-host*) link)) - ""))) + (if *meme-links* + (let ((link (fetch-irc-log-link (string-left-trim "#" channel)))) + (if (stringp link) + (araneida:urlstring (araneida:merge-url (araneida:make-url :scheme "http" :host *meme-host*) link)) + ""))))

Index: lisppaste2/variable.lisp diff -u lisppaste2/variable.lisp:1.9 lisppaste2/variable.lisp:1.10 --- lisppaste2/variable.lisp:1.9 Fri Jan 30 11:36:37 2004 +++ lisppaste2/variable.lisp Wed Feb 4 08:11:22 2004 @@ -1,4 +1,4 @@ -;;;; $Id: variable.lisp,v 1.9 2004/01/30 16:36:37 bmastenbrook Exp $ +;;;; $Id: variable.lisp,v 1.10 2004/02/04 13:11:22 bmastenbrook Exp $ ;;;; $Source: /project/lisppaste/cvsroot/lisppaste2/variable.lisp,v $

;;;; See the LICENSE file for licensing information. @@ -7,10 +7,10 @@

(defparameter *internal-http-port* 8081 "Port lisppaste's araneida will listen on for requests from Apache.") -(defparameter *external-http-port* 8081 +(defparameter *external-http-port* 80 "Port lisppaste's araneida will listen on for requests from remote clients.")

-(defparameter *paste-site-name* "localhost" +(defparameter *paste-site-name* "www.common-lisp.net" "Website we are running on (used for creating links).")

(defparameter *paste-url* @@ -23,7 +23,12 @@ (araneida:merge-url (araneida:make-url :scheme "http" :host *paste-site-name* - :port *external-http-port*) "/paste/")) + ) "/paste/")) + +(defvar *meme-links* t) ; whether meme links are enabled + +;; You should not have to edit below this line +;; LINE

(defparameter *display-paste-url* (araneida:merge-url *paste-external-url* "display/")) @@ -45,7 +50,7 @@ (setf (araneida:url-port fwd-url) *internal-http-port*) (make-instance 'araneida:serve-event-reverse-proxy-listener :translations - `((,(araneida:urlstring *paste-url*) + `((,(araneida:urlstring *paste-external-url*) ,(araneida:urlstring fwd-url))) :address #(0 0 0 0) :port (araneida:url-port fwd-url))))