bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 06:50:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix piler.conf path in pilerpurge.py

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO 2019-12-15 14:42:35 +01:00
parent d99ee3dec0
commit bfc9171fc7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/postinstall.sh.in
View File

@ -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"