Explorar el Código

Restore ownership of certs

Bob Mottram hace 9 años
padre
commit
c7112d1ec0
Se han modificado 3 ficheros con 53 adiciones y 1 borrados
  1. 5
    1
      src/freedombone
  2. 24
    0
      src/freedombone-restore-local
  3. 24
    0
      src/freedombone-restore-remote

+ 5
- 1
src/freedombone Ver fichero

@@ -3289,7 +3289,11 @@ function search_for_attached_usb_drive {
3289 3289
                 chown root:dovecot /etc/ssl/private/dovecot.*
3290 3290
             fi
3291 3291
             if [ -f /etc/ssl/private/exim.key ]; then
3292
-                chown root:Debian-exim /etc/ssl/private/exim.key /etc/ssl/certs/exim.crt /etc/ssl/certs/exim.dhparam
3292
+                cp /etc/ssl/private/exim.key /etc/exim4
3293
+                cp /etc/ssl/certs/exim.crt /etc/exim4
3294
+                cp /etc/ssl/certs/exim.dhparam /etc/exim4
3295
+                chown root:Debian-exim /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
3296
+                chmod 640 /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
3293 3297
             fi
3294 3298
         fi
3295 3299
         if [ -d $USB_MOUNT/personal ]; then

+ 24
- 0
src/freedombone-restore-local Ver fichero

@@ -586,6 +586,30 @@ function restore_certs {
586 586
             exit 276
587 587
         fi
588 588
         rm -rf /root/tempssl
589
+
590
+        # restore ownership
591
+        if [ -f /etc/ssl/private/xmpp.key ]; then
592
+            chown prosody:prosody /etc/ssl/private/xmpp.key
593
+            chown prosody:prosody /etc/ssl/certs/xmpp.*
594
+        fi
595
+        if [ -d /etc/dovecot ]; then
596
+            chown root:dovecot /etc/ssl/private/dovecot.*
597
+            chown root:dovecot /etc/ssl/certs/dovecot.*
598
+        fi
599
+        if [ -f /etc/ssl/private/exim.key ]; then
600
+			cp /etc/ssl/private/exim.key /etc/exim4
601
+			cp /etc/ssl/certs/exim.crt /etc/exim4
602
+			cp /etc/ssl/certs/exim.dhparam /etc/exim4
603
+			chown root:Debian-exim /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
604
+			chmod 640 /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
605
+        fi
606
+        if [ -f /etc/ssl/private/mumble.key ]; then
607
+            if [ -d /var/lib/mumble-server ]; then
608
+                cp /etc/ssl/certs/mumble.* /var/lib/mumble-server
609
+                cp /etc/ssl/private/mumble.key /var/lib/mumble-server
610
+                chown -R mumble-server:mumble-server /var/lib/mumble-server
611
+            fi
612
+        fi
589 613
     fi
590 614
 }
591 615
 

+ 24
- 0
src/freedombone-restore-remote Ver fichero

@@ -469,6 +469,30 @@ function restore_certs {
469 469
             exit 276
470 470
         fi
471 471
         rm -rf /root/tempssl
472
+
473
+        # restore ownership
474
+        if [ -f /etc/ssl/private/xmpp.key ]; then
475
+            chown prosody:prosody /etc/ssl/private/xmpp.key
476
+            chown prosody:prosody /etc/ssl/certs/xmpp.*
477
+        fi
478
+        if [ -d /etc/dovecot ]; then
479
+            chown root:dovecot /etc/ssl/private/dovecot.*
480
+            chown root:dovecot /etc/ssl/certs/dovecot.*
481
+        fi
482
+        if [ -f /etc/ssl/private/exim.key ]; then
483
+            cp /etc/ssl/private/exim.key /etc/exim4
484
+            cp /etc/ssl/certs/exim.crt /etc/exim4
485
+            cp /etc/ssl/certs/exim.dhparam /etc/exim4
486
+            chown root:Debian-exim /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
487
+            chmod 640 /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
488
+        fi
489
+        if [ -f /etc/ssl/private/mumble.key ]; then
490
+            if [ -d /var/lib/mumble-server ]; then
491
+                cp /etc/ssl/certs/mumble.* /var/lib/mumble-server
492
+                cp /etc/ssl/private/mumble.key /var/lib/mumble-server
493
+                chown -R mumble-server:mumble-server /var/lib/mumble-server
494
+            fi
495
+        fi
472 496
     fi
473 497
 }
474 498