Kaynağa Gözat

Ensure that the bundled certificate is used with redmatrix

Bob Mottram 10 yıl önce
ebeveyn
işleme
fb7c4263f2
2 değiştirilmiş dosya ile 8 ekleme ve 0 silme
  1. 4
    0
      src/freedombone
  2. 4
    0
      src/freedombone-renew-cert

+ 4
- 0
src/freedombone Dosyayı Görüntüle

@@ -2522,6 +2522,8 @@ function create_restore_script {
2522 2522
       echo '    exit 759' >> /usr/bin/$RESTORE_SCRIPT_NAME
2523 2523
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2524 2524
       echo '  rm -rf /root/tempredmatrix' >> /usr/bin/$RESTORE_SCRIPT_NAME
2525
+      echo '  # Ensure that the bundled SSL cert is being used' >> /usr/bin/$RESTORE_SCRIPT_NAME
2526
+      echo "  sed -i 's|$REDMATRIX_DOMAIN_NAME.crt|$REDMATRIX_DOMAIN_NAME.bundle.crt|g' /etc/nginx/sites-available/$REDMATRIX_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
2525 2527
       echo "  chmod 777 /var/www/$REDMATRIX_DOMAIN_NAME/htdocs/store/[data]/smarty3" >> /usr/bin/$RESTORE_SCRIPT_NAME
2526 2528
       echo "  chown -R www-data:www-data /var/www/$REDMATRIX_DOMAIN_NAME/htdocs/*" >> /usr/bin/$RESTORE_SCRIPT_NAME
2527 2529
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3943,6 +3945,8 @@ function restore_from_friend {
3943 3945
       echo '    exit 759' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3944 3946
       echo '  fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3945 3947
       echo '  rm -rf /root/tempredmatrix' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3948
+      echo '  # Ensure that the bundled SSL cert is being used' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3949
+      echo "  sed -i 's|$REDMATRIX_DOMAIN_NAME.crt|$REDMATRIX_DOMAIN_NAME.bundle.crt|g' /etc/nginx/sites-available/$REDMATRIX_DOMAIN_NAME" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3946 3950
       echo "  chmod 777 /var/www/$REDMATRIX_DOMAIN_NAME/htdocs/store/[data]/smarty3" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3947 3951
       echo "  chown -R www-data:www-data /var/www/$REDMATRIX_DOMAIN_NAME/htdocs/*" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3948 3952
       echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME

+ 4
- 0
src/freedombone-renew-cert Dosyayı Görüntüle

@@ -102,6 +102,10 @@ function renew_startssl {
102 102
 
103 103
         rm /etc/ssl/certs/$HOSTNAME.new.crt
104 104
         rm /etc/ssl/requests/$HOSTNAME.csr
105
+
106
+        # update your site to include the bundle
107
+        sed -i "s|$HOSTNAME.crt|$HOSTNAME.bundle.crt|g" /etc/nginx/sites-available/$HOSTNAME
108
+
105 109
         echo 'Certificate installed'
106 110
         service nginx restart
107 111
         return