diff --git a/util/postinstall.sh.in b/util/postinstall.sh.in index c9ebd17..d9d58ab 100755 --- a/util/postinstall.sh.in +++ b/util/postinstall.sh.in @@ -380,6 +380,9 @@ rm -f "$KEYTMPFILE" echo "Done." + echo "Fix piler.conf path in pilerpurge.py" + sed "s%\/etc\/piler\/piler\.conf%${SYSCONFDIR}\/piler\/piler\.conf%" "${LIBEXECDIR}/pilerpurge.py" + make_certificate cat < "$SOCKET_HELPER_SCRIPT" @@ -391,7 +394,7 @@ MYSQL_SOCKET=$(perl "$SOCKET_HELPER_SCRIPT" "$MYSQL_SOCKET") sed -e "s/mysqlpwd=verystrongpassword/mysqlpwd=${MYSQL_PASSWORD}/" -e "s/tls_enable=0/tls_enable=1/" -e "s/mysqlsocket=\/var\/run\/mysqld\/mysqld.sock/mysqlsocket=${MYSQL_SOCKET}/" "${SYSCONFDIR}/piler/piler.conf.dist" > "$PILERCONF_TMP" - [[ grep queuedir "$PILERCONF_TMP" ]] || echo queuedir=/var/piler/store >> "$PILERCONF_TMP" + [[ $(grep queuedir "$PILERCONF_TMP") ]] || echo queuedir=/var/piler/store >> "$PILERCONF_TMP" cat "$PILERCONF_TMP" > "${SYSCONFDIR}/piler/piler.conf" rm -f "$PILERCONF_TMP"