Fix default location of lurker data dir

conf/apache2/sites-available/000-default.conf

@@ -11,7 +11,7 @@
         RewriteRule ^(/list/.*\.html)/$  $1 [R]
 
         # disabilita il sito quando e' in corso la rigenerazione
-        RewriteCond /var/lib/lurker/.tmp -d
+        RewriteCond /var/lib/lurker/data/.tmp -d
 
         <Directory /var/lib/lurker/www>
           Require all granted
@@ -22,10 +22,8 @@
           AddDefaultCharset UTF-8
 
           # invoke lurker if the requested file does not exist
-          <IfModule mod_rewrite.c>
           RewriteEngine on
           RewriteCond %{REQUEST_FILENAME} !-s
           RewriteRule ^(attach|list|mbox|message|mindex|search|splash|thread|zap)/[^/]+$ /cgi-lurker/lurker.cgi [L,PT,E=LURKER_CONFIG:/etc/lurker/lurker.conf,E=LURKER_FRONTEND:%{REQUEST_FILENAME}]
-          </IfModule>
         </Directory>
 </VirtualHost>

smtpd.go

@@ -24,7 +24,7 @@ import (
 var (
 	port          = flag.Int("port", getenvInt("SMTP_PORT"), "smtp port")
 	hostname      = flag.String("ehlo-hostname", os.Getenv("SMTP_EHLO_HOSTNAME"), "EHLO hostname")
-	lurkerLibDir = flag.String("lurker-lib-dir", os.Getenv("LURKER_LIB_DIR"), "lurker library dir")
+	lurkerDataDir = flag.String("lurker-data-dir", getenvDefault("LURKER_DATA_DIR", "/var/lib/lurker/data"), "lurker data dir")
 	addrPattern   = flag.String("addr-rx", getenvDefault("LURKER_ADDR_RX", `lurker\+([^@]+)@.*`), "recipient address regular expression")
 )
 
@@ -43,7 +43,7 @@ func getenvDefault(key, dflt string) string {
 }
 
 func isMaintenanceModeOn() bool {
-	_, err := os.Stat(filepath.Join(*lurkerLibDir, ".tmp"))
+	_, err := os.Stat(filepath.Join(*lurkerDataDir, ".tmp"))
 	return !os.IsNotExist(err)
 }