Bläddra i källkod

Permissions on lets encrypt directory

To allow apps using a dedicated user account to read certificates
Bob Mottram 8 år sedan
förälder
incheckning
490a6c9982
3 ändrade filer med 13 tillägg och 1 borttagningar
  1. 5
    0
      src/freedombone-addcert
  2. 6
    1
      src/freedombone-app-matrix
  3. 2
    0
      src/freedombone-restore-local

+ 5
- 0
src/freedombone-addcert Visa fil

279
 
279
 
280
     update_default_domain
280
     update_default_domain
281
 
281
 
282
+    # this group can be used to assign read permissions for
283
+    # application user accounts
284
+    chgrp -R ssl-cert /etc/letsencrypt
285
+    chmod -R g=rX /etc/letsencrypt
286
+
282
     nginx_ensite ${LETSENCRYPT_HOSTNAME}
287
     nginx_ensite ${LETSENCRYPT_HOSTNAME}
283
     systemctl start nginx
288
     systemctl start nginx
284
 
289
 

+ 6
- 1
src/freedombone-app-matrix Visa fil

214
 
214
 
215
     if [[ $ONION_ONLY == "no" ]]; then
215
     if [[ $ONION_ONLY == "no" ]]; then
216
         sed -i "s|tls_certificate_path:.*|tls_certificate_path: \"/etc/ssl/certs/${MATRIX_DOMAIN_NAME}.pem\"|g" "${filepath}"
216
         sed -i "s|tls_certificate_path:.*|tls_certificate_path: \"/etc/ssl/certs/${MATRIX_DOMAIN_NAME}.pem\"|g" "${filepath}"
217
-        sed -i "s|tls_private_key_path:.*|tls_private_key_path: \"/etc/ssl/private/${MATRIX_DOMAIN_NAME}.key\"|g" "${filepath}"
217
+        if ! grep -q '#tls_private_key_path' "${filepath}"; then
218
+            sed -i 's|tls_private_key_path|#tls_private_key_path|g' "${filepath}"
219
+        fi
218
         sed -i "s|tls_dh_params_path:.*|tls_dh_params_path: \"/etc/ssl/certs/${MATRIX_DOMAIN_NAME}.dhparam\"|g" "${filepath}"
220
         sed -i "s|tls_dh_params_path:.*|tls_dh_params_path: \"/etc/ssl/certs/${MATRIX_DOMAIN_NAME}.dhparam\"|g" "${filepath}"
219
     fi
221
     fi
220
     sed -i 's|8448|8449|g' "${filepath}"
222
     sed -i 's|8448|8449|g' "${filepath}"
524
     groupadd matrix
526
     groupadd matrix
525
     useradd -c "Matrix system account" -d $MATRIX_DATA_DIR -m -r -g matrix matrix
527
     useradd -c "Matrix system account" -d $MATRIX_DATA_DIR -m -r -g matrix matrix
526
     usermod -a -G www-data matrix
528
     usermod -a -G www-data matrix
529
+    usermod -a -G ssl-cert matrix
527
 
530
 
528
     function_check install_turn
531
     function_check install_turn
529
     install_turn
532
     install_turn
623
                 exit 73572
626
                 exit 73572
624
             fi
627
             fi
625
         fi
628
         fi
629
+        chgrp -R ssl-cert /etc/letsencrypt
630
+        chmod -R g=rX /etc/letsencrypt
626
     fi
631
     fi
627
 
632
 
628
     export DEBIAN_FRONTEND=noninteractive
633
     export DEBIAN_FRONTEND=noninteractive

+ 2
- 0
src/freedombone-restore-local Visa fil

223
     if [ -d $USB_MOUNT/backup/letsencrypt ]; then
223
     if [ -d $USB_MOUNT/backup/letsencrypt ]; then
224
         echo $"Restoring Lets Encrypt settings"
224
         echo $"Restoring Lets Encrypt settings"
225
         restore_directory_from_usb / letsencrypt
225
         restore_directory_from_usb / letsencrypt
226
+        chgrp -R ssl-cert /etc/letsencrypt
227
+        chmod -R g=rX /etc/letsencrypt
226
     fi
228
     fi
227
 }
229
 }
228
 
230