0.1.14 fixes

etc/Makefile.in

@@ -26,11 +26,11 @@ INSTALL = @INSTALL@
 
 all:
 	sed -e 's%pidfile=.*%pidfile=$(localstatedir)/run/piler/piler.pid%g' \
-	-e 's%workdir=.*%workdir=$(localstatedir)/spool/piler/tmp%g' \
-	-e 's%queuedir=.*%queuedir=$(localstatedir)/piler/queue%g' < $(srcdir)/example.conf > $(srcdir)/piler.conf
+	-e 's%iv=.*%iv=@iv@%g' \
+	-e 's%workdir=.*%workdir=$(localstatedir)/piler/tmp%g' < $(srcdir)/example.conf > $(srcdir)/piler.conf
 
 install:
-	if [ ! -f "$(DESTDIR)$(sysconfdir)/piler.conf" ]; then $(INSTALL) -m 0640 $(srcdir)/piler.conf $(DESTDIR)$(sysconfdir)/piler.conf; chgrp $(CLAPF_GROUP) $(DESTDIR)$(sysconfdir)/piler.conf; fi
+	if [ ! -f "$(DESTDIR)$(sysconfdir)/piler.conf" ]; then $(INSTALL) -m 0640 -g $(RUNNING_GROUP) $(srcdir)/piler.conf $(DESTDIR)$(sysconfdir)/piler.conf; fi
 
 clean:
 	rm -f piler.conf cron.jobs

etc/cron.jobs.in

@@ -25,5 +25,5 @@ piler's crontab:
 sphinx's cronjob:
 
 */5 * * * * /usr/local/bin/indexer --quiet delta1 --rotate && sleep 2 && /usr/local/bin/indexer --quiet --merge main1 delta1 --merge-dst-range deleted 0 0 --rotate
-*/5 * * * * /usr/local/bin/indexer --quiet tag1 --rotate
+*/15 * * * * /usr/local/bin/indexer --quiet tag1 --rotate
 

etc/example.conf

@@ -11,6 +11,9 @@ verbosity=1
 ; it it was started by root
 username=piler
 
+; this is a 16 character long vector
+iv=****************
+
 ; number of worker processes, ie. the number of simultaneous smtp connections to piler.
 number_of_worker_processes=10
 
@@ -18,7 +21,7 @@ number_of_worker_processes=10
 max_requests_per_child=1000
 
 ; SMTP HELO identification string
-hostid=av-engine.localhost
+hostid=mailarchiver.localhost
 
 ; write pid file
 pidfile=/var/run/piler/piler.pid
@@ -32,7 +35,7 @@ clamd_socket=/tmp/clamd
 session_timeout=420
 
 ; the 2nd parameter of the listen() system call. Please note that this is set
-; when clapf starts up and you should restart clapf if you change this variable.
+; when piler starts up and you should restart piler if you change this variable.
 ; Please also note that the meaning of this variable depends on your Unix implementation
 backlog=20
 
@@ -68,7 +71,7 @@ spam_header_line=
 ; memcached stuff
 ;
 
-; memcached server to use. Currently clapf support only 1 memcached server
+; memcached server to use. Currently piler supports only 1 memcached server
 memcached_servers=127.0.0.1
 
 ; ttl (in secs) of a stored object
@@ -82,7 +85,7 @@ update_counters_to_memcached=0
 ; this setting is only effective if you have update_counters_to_memcached=1
 ;
 ; hint: if you are using a mysql replicated environment and you do _not_ want
-; clapf to write to the replicated database (because you do sync it some other
+; piler to write to the replicated database (because you do sync it some other
 ; way to the master database or you are not interested in keeping the counters
 ; persistantly at all), then specify a big number here, that fits to the 
 ; "long int" size, eg. 2147483647
@@ -97,26 +100,7 @@ memcached_to_db_interval=900
 ;mysqlport=3306
 mysqlsocket=/tmp/mysql.sock
 mysqluser=piler
-mysqlpwd=changeme
+mysqlpwd=verystrongpassword
 mysqldb=piler
 mysql_connect_timeout=2
 
-
-;
-; sqlite3 stuff
-;
-
-; If you are using spamdrop (not the clapf daemon), you have two options:
-; 1. You may specify this variable, then every user will share this token
-; database (=shared database) OR
-; 2. comment this variable out, and spamdrop will figure out where the users'
-; individual token databases are.
-sqlite3=/var/lib/piler/data/tokens.sdb
-
-; set sqlite3 pragma, see http://www.sqlite.org/pragma.html for more details
-; possible values are:
-; PRAGMA synchronous = FULL
-; PRAGMA synchronous = NORMAL
-; PRAGMA synchronous = OFF
-sqlite3_pragma=PRAGMA synchronous = OFF
-

etc/sphinx.conf

@@ -6,9 +6,9 @@ source main
 {
    type = mysql
    sql_host = localhost
-   sql_db = sphinx
-   sql_user = sphinx
-   sql_pass = sphinx
+   sql_db = piler
+   sql_user = piler
+   sql_pass = piler
 
    sql_query_pre = SET NAMES utf8
    sql_query = SELECT id, `from`, `to`, `fromdomain`, `todomain`, `subject`, `arrived`, `sent`, `body`, `size`, `direction`, `attachments`, `attachment_types` FROM sph_index \
@@ -26,9 +26,9 @@ source delta
 {
    type = mysql
    sql_host = localhost
-   sql_db = sphinx
-   sql_user = sphinx
-   sql_pass = sphinx
+   sql_db = piler
+   sql_user = piler
+   sql_pass = piler
 
    sql_query_pre = SET NAMES utf8
    sql_query_pre  = REPLACE INTO sph_counter SELECT 1, MAX(id) FROM sph_index
@@ -52,9 +52,9 @@ source tag
 {
    type = mysql
    sql_host = localhost
-   sql_db = sphinx
-   sql_user = sphinx
-   sql_pass = sphinx
+   sql_db = piler
+   sql_user = piler
+   sql_pass = piler
 
    sql_query_pre = SET NAMES utf8
    sql_query  = SELECT id, `uid`, `tag` FROM `tag`
@@ -67,7 +67,7 @@ source tag
 index main1
 {
 	source			= main
-	path			= /var/data/main1
+	path			= /var/piler/sphinx/main1
 	docinfo			= extern
 	charset_type		= utf-8
 }
@@ -76,7 +76,7 @@ index main1
 index delta1
 {
         source                  = delta
-        path                    = /var/data/delta1
+        path                    = /var/piler/sphinx/delta1
         docinfo                 = extern
         charset_type            = utf-8
 }
@@ -85,7 +85,7 @@ index delta1
 index tag1
 {
         source                  = tag
-        path                    = /var/data/tag1
+        path                    = /var/piler/sphinx/tag1
         docinfo                 = extern
         charset_type            = utf-8
 }
@@ -99,14 +99,14 @@ indexer
 
 searchd
 {
-	listen			= 9312
-	listen			= 9306:mysql41
-	log			= /var/data/log/searchd.log
+	listen			= 127.0.0.1:9312
+	listen			= 127.0.0.1:9306:mysql41
+	log			= /dev/null
 	binlog_path             = 
-	query_log		= /var/data/log/query.log
+	##query_log		=
 	read_timeout		= 5
 	max_children		= 30
-	pid_file		= /var/data/log/searchd.pid
+	pid_file		= /var/piler/sphinx/searchd.pid
 	max_matches		= 1000
 	seamless_rotate		= 1
 	preopen_indexes		= 1