mirror of
https://bitbucket.org/jsuto/piler.git
synced 2024-12-25 07:40:12 +01:00
Fix piler.conf path in pilerpurge.py
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
parent
d99ee3dec0
commit
bfc9171fc7
@ -380,6 +380,9 @@ execute_post_install_tasks() {
|
|||||||
rm -f "$KEYTMPFILE"
|
rm -f "$KEYTMPFILE"
|
||||||
echo "Done."
|
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
|
make_certificate
|
||||||
|
|
||||||
cat <<SOCKHELPER > "$SOCKET_HELPER_SCRIPT"
|
cat <<SOCKHELPER > "$SOCKET_HELPER_SCRIPT"
|
||||||
@ -391,7 +394,7 @@ SOCKHELPER
|
|||||||
MYSQL_SOCKET=$(perl "$SOCKET_HELPER_SCRIPT" "$MYSQL_SOCKET")
|
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"
|
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"
|
cat "$PILERCONF_TMP" > "${SYSCONFDIR}/piler/piler.conf"
|
||||||
rm -f "$PILERCONF_TMP"
|
rm -f "$PILERCONF_TMP"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user