Merge c449994e22 into 83774d470b

Fix #234
Update rsync parameter : Adding -A to copy ACL as well
2024-11-23 13:56:30 +00:00 · 2024-09-25 17:28:42 +01:00 · 2024-09-20 16:38:26 +02:00 · 2022-08-25 18:31:43 -04:00 · 2022-08-25 16:31:47 -04:00 · 2022-08-25 16:28:09 -04:00
3 changed files with 39 additions and 2 deletions
--- a/4
+++ b/4
@ -46,7 +46,7 @@ sync_to_disk() {
    fi

    if [ -z "${NO_RSYNC}" ] && [ -x "$(command -v rsync)" ]; then
-        rsync -aXv --sparse --inplace --no-whole-file --delete-after "${optional_params[@]}" "$RAM_LOG"/ "$HDD_LOG"/ 2>&1 |
+        rsync -aAXv --sparse --inplace --no-whole-file --delete-after "${optional_params[@]}" "$RAM_LOG"/ "$HDD_LOG"/ 2>&1 |
            tee -a "$LOG2RAM_LOG"
    else
        cp -rfup --sparse=always "$RAM_LOG"/ -T "$HDD_LOG"/ 2>&1 | tee -a "$LOG2RAM_LOG"
@ -75,7 +75,7 @@ sync_from_disk() {
    fi

    if [ -z "${NO_RSYNC}" ] && [ -x "$(command -v rsync)" ]; then
-        rsync -aXv --sparse --inplace --no-whole-file --delete-after "$HDD_LOG"/ "$RAM_LOG"/ 2>&1 | tee -a "$LOG2RAM_LOG"
+        rsync -aAXv --sparse --inplace --no-whole-file --delete-after "$HDD_LOG"/ "$RAM_LOG"/ 2>&1 | tee -a "$LOG2RAM_LOG"
    else
        cp -rfup --sparse=always "$HDD_LOG"/ -T "$RAM_LOG"/ 2>&1 | tee -a "$LOG2RAM_LOG"
    fi
--- a/log2ram-daily.service
+++ b/log2ram-daily.service
@ -4,3 +4,20 @@ After=log2ram.service

 [Service]
 ExecStart=/bin/systemctl reload log2ram.service
+
+# Sandboxing
+LockPersonality=true
+MemoryDenyWriteExecute=true
+NoNewPriviliges=true
+PrivateDevices=true
+PrivateNetwork=true 
+  #May affect "Mail" in log2ram.conf.
+ProtectClock=true
+ProtectControlGroups=true
+ProtectHostname=true
+ProtectKernelLogs=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+RestrictSUIDSGID=true
+ProtectSystem=strict
+ProtectHome=true 
--- a/log2ram.service
+++ b/log2ram.service
@ -15,5 +15,25 @@ ExecReload=/usr/local/bin/log2ram write
 TimeoutStartSec=120
 RemainAfterExit=yes

+# Sandboxing
+LockPersonality=true
+MemoryDenyWriteExecute=true
+NoNewPriviliges=true
+PrivateDevices=true
+PrivateNetwork=true 
+  #May break "MAIL" in log2ram.conf if it points to non-local web address. 
+ProtectClock=true
+ProtectControlGroups=true
+ProtectHostname=true
+ProtectKernelLogs=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+RestrictSUIDSGID=true
+ProtectSystem=true
+  # ALT: ProtectSystem=full # needs rw whitelisting for /var/hdd.log/ 
+ProtectHome=true 
+  #may cause breakage in situations wherein user has configured log2ram to also copy logs from $HOME. 
+  #can probably fix with systemctl edit to whitelist relevant dirs. See: ReadWritePaths=
+
 [Install]
 WantedBy=sysinit.target
Author	SHA1	Message	Date
TubbyCat	0d626d8d2f	Merge `c449994e22` into `83774d470b`	2024-09-25 17:28:42 +01:00
azlux	83774d470b	Fix #234 Update rsync parameter : Adding -A to copy ACL as well	2024-09-20 16:38:26 +02:00
TubbyCat	c449994e22	Update log2ram.service	2022-08-25 18:31:43 -04:00
TubbyCat	c7aef205b1	Update log2ram.service	2022-08-25 16:31:47 -04:00
TubbyCat	7f2f8d20db	Update log2ram-daily.service	2022-08-25 16:28:09 -04:00
TubbyCat	69bc7a5cbe	Update log2ram.service	2022-08-25 00:00:05 -04:00
TubbyCat	02e7e6bcbd	Update log2ram.service	2022-08-24 22:33:28 -04:00
TubbyCat	e38c73e2d5	Update log2ram.service untested. partial sandboxing.	2022-08-24 22:32:40 -04:00
TubbyCat	a378dd30cb	Update log2ram-daily.service	2022-07-16 22:19:03 -04:00