1
0
mirror of https://github.com/azlux/log2ram.git synced 2023-10-10 13:37:24 +02:00

Fixed consistent naming of /var/hdd.log

This commit is contained in:
Nathan Huizinga 2017-12-07 17:42:40 +01:00
parent db049c32eb
commit 658161bb04
4 changed files with 21 additions and 15 deletions

View File

@ -36,7 +36,7 @@ mount
If you have issue with apache2 , you can try to add `apache2.service` next to other services on the `Before` parameter into /etc/systemd/system/log2ram.service it will solve the pb If you have issue with apache2 , you can try to add `apache2.service` next to other services on the `Before` parameter into /etc/systemd/system/log2ram.service it will solve the pb
The log for log2ram will be write here : `/var/log.hdd/log2ram.log` The log for log2ram will be write here : `/var/hdd.log/log2ram.log`
###### Now, muffins for everyone ! ###### Now, muffins for everyone !

View File

@ -12,8 +12,8 @@ then
cp log2ram.hourly /etc/cron.hourly/log2ram cp log2ram.hourly /etc/cron.hourly/log2ram
chmod +x /etc/cron.hourly/log2ram chmod +x /etc/cron.hourly/log2ram
if [ -d /var/log.hdd ]; then if [ -d /var/hdd.log ]; then
rm -r /var/log.hdd rm -r /var/hdd.log
fi fi
echo "##### Reboot to activate log2ram #####" echo "##### Reboot to activate log2ram #####"

View File

@ -5,7 +5,8 @@
HDD_LOG=/var/hdd.log HDD_LOG=/var/hdd.log
RAM_LOG=/var/log RAM_LOG=/var/log
LOG2RAM_LOG="${HDD_LOG}/log2ram.log" LOG_NAME="log2ram.log"
LOG2RAM_LOG="${HDD_LOG}/${LOG_NAME}"
LOG_OUTPUT="tee -a $LOG2RAM_LOG" LOG_OUTPUT="tee -a $LOG2RAM_LOG"
isSafe () { isSafe () {
@ -17,7 +18,7 @@ syncToDisk () {
isSafe isSafe
if [ "$USE_RSYNC" = true ]; then if [ "$USE_RSYNC" = true ]; then
rsync -aXWv --delete --exclude log2ram.log --links $RAM_LOG/ $HDD_LOG/ 2>&1 | $LOG_OUTPUT rsync -aXWv --delete --exclude $LOG_NAME --links $RAM_LOG/ $HDD_LOG/ 2>&1 | $LOG_OUTPUT
else else
cp -rfup $RAM_LOG/ -T $HDD_LOG/ 2>&1 | $LOG_OUTPUT cp -rfup $RAM_LOG/ -T $HDD_LOG/ 2>&1 | $LOG_OUTPUT
fi fi
@ -37,7 +38,7 @@ syncFromDisk () {
fi fi
if [ "$USE_RSYNC" = true ]; then if [ "$USE_RSYNC" = true ]; then
rsync -aXWv --delete --exclude log2ram.log --links $HDD_LOG/ $RAM_LOG/ 2>&1 | $LOG_OUTPUT rsync -aXWv --delete --exclude $LOG_NAME --links $HDD_LOG/ $RAM_LOG/ 2>&1 | $LOG_OUTPUT
else else
cp -rfup $HDD_LOG/ -T $RAM_LOG/ 2>&1 | $LOG_OUTPUT cp -rfup $HDD_LOG/ -T $RAM_LOG/ 2>&1 | $LOG_OUTPUT
fi fi
@ -52,10 +53,10 @@ wait_for () {
case "$1" in case "$1" in
start) start)
[ -d $HDD_LOG/ ] || mkdir $HDD_LOG/ [ -d $HDD_LOG/ ] || mkdir $HDD_LOG/
rm -f $LOG2RAM_LOG
mount --bind $RAM_LOG/ $HDD_LOG/ mount --bind $RAM_LOG/ $HDD_LOG/
mount --make-private $HDD_LOG/ mount --make-private $HDD_LOG/
wait_for $HDD_LOG wait_for $HDD_LOG
rm -f $LOG2RAM_LOG
mount -t tmpfs -o nosuid,noexec,nodev,mode=0755,size=$SIZE log2ram $RAM_LOG/ mount -t tmpfs -o nosuid,noexec,nodev,mode=0755,size=$SIZE log2ram $RAM_LOG/
wait_for $RAM_LOG wait_for $RAM_LOG
syncFromDisk syncFromDisk

View File

@ -8,6 +8,11 @@ then
rm /usr/local/bin/log2ram rm /usr/local/bin/log2ram
rm /etc/log2ram.conf rm /etc/log2ram.conf
rm /etc/cron.hourly/log2ram rm /etc/cron.hourly/log2ram
if [ -d /var/hdd.log ]; then
rm -r /var/hdd.log
fi
echo "##### Reboot isn't needed #####" echo "##### Reboot isn't needed #####"
else else
echo "You need to be ROOT (sudo can be used)" echo "You need to be ROOT (sudo can be used)"