debian related fixes

This commit is contained in:
SJ 2013-10-13 21:39:34 +02:00
parent 466f1fe7be
commit e4154cd92e
3 changed files with 8 additions and 6 deletions

8
debian/postinst vendored
View File

@ -19,6 +19,8 @@ generate_key_file() {
if [ ! -f /usr/local/etc/piler.key ]; then if [ ! -f /usr/local/etc/piler.key ]; then
echo "generating key file . . ." echo "generating key file . . ."
dd if=/dev/urandom bs=56 count=1 of=/usr/local/etc/piler.key dd if=/dev/urandom bs=56 count=1 of=/usr/local/etc/piler.key
chgrp piler /usr/local/etc/piler.key
chmod 640 /usr/local/etc/piler.key
fi fi
} }
@ -27,8 +29,8 @@ fi
fix_permissions() { fix_permissions() {
chown piler:piler /usr/local/bin/pilerexport /usr/local/bin/pilerpurge /usr/local/bin/pilerimport /usr/local/bin/pilerget /usr/local/bin/pileraget /usr/local/bin/reindex chown piler:piler /usr/local/bin/pilerexport /usr/local/bin/pilerpurge /usr/local/bin/pilerimport /usr/local/bin/pilerget /usr/local/bin/pileraget /usr/local/bin/reindex
chmod +s /usr/local/bin/pilerexport /usr/local/bin/pilerpurge /usr/local/bin/pilerimport /usr/local/bin/pilerget /usr/local/bin/pileraget /usr/local/bin/reindex chmod +s /usr/local/bin/pilerexport /usr/local/bin/pilerpurge /usr/local/bin/pilerimport /usr/local/bin/pilerget /usr/local/bin/pileraget /usr/local/bin/reindex
chgrp piler /usr/local/etc/piler.conf /usr/local/etc/piler.key chgrp piler /usr/local/etc/piler.conf
chmod 640 /usr/local/etc/piler.conf /usr/local/etc/piler.key chmod 640 /usr/local/etc/piler.conf
} }
@ -37,7 +39,7 @@ case "$1" in
chown piler:piler /var/run/piler /var/piler/store /var/piler/tmp chown piler:piler /var/run/piler /var/piler/store /var/piler/tmp
generate_pem_file generate_pem_file
generate_key_file ###generate_key_file
fix_permissions fix_permissions
ldconfig ldconfig

View File

@ -31,6 +31,7 @@ all:
install: install:
if [ ! -f "$(DESTDIR)$(sysconfdir)/piler.conf" ]; then $(INSTALL) -m 0640 -g $(RUNNING_GROUP) $(srcdir)/piler.conf $(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
$(INSTALL) -m 0644 -g $(RUNNING_GROUP) $(srcdir)/sphinx.conf.in $(DESTDIR)$(sysconfdir)/sphinx.conf.dist; fi
clean: clean:
rm -f piler.conf cron.jobs rm -f piler.conf cron.jobs

View File

@ -336,9 +336,8 @@ execute_post_install_tasks() {
mysql -h $MYSQL_HOSTNAME -u $MYSQL_USERNAME --password=$MYSQL_PASSWORD $MYSQL_DATABASE < $DATAROOTDIR/piler/db-mysql.sql mysql -h $MYSQL_HOSTNAME -u $MYSQL_USERNAME --password=$MYSQL_PASSWORD $MYSQL_DATABASE < $DATAROOTDIR/piler/db-mysql.sql
echo "Done." echo "Done."
echo -n "Overwriting sphinx configuration... "; echo -n "Writing sphinx configuration... ";
sed -e "s%MYSQL_HOSTNAME%$MYSQL_HOSTNAME%" -e "s%MYSQL_DATABASE%$MYSQL_DATABASE%" -e "s%MYSQL_USERNAME%$MYSQL_USERNAME%" -e "s%MYSQL_PASSWORD%$MYSQL_PASSWORD%" etc/sphinx.conf.in > etc/sphinx.conf sed -e "s%MYSQL_HOSTNAME%$MYSQL_HOSTNAME%" -e "s%MYSQL_DATABASE%$MYSQL_DATABASE%" -e "s%MYSQL_USERNAME%$MYSQL_USERNAME%" -e "s%MYSQL_PASSWORD%$MYSQL_PASSWORD%" $SYSCONFDIR/sphinx.conf.dist > $SPHINXCFG
cp etc/sphinx.conf $SPHINXCFG
echo "Done." echo "Done."
echo -n "Initializing sphinx indices... "; echo -n "Initializing sphinx indices... ";