free
/
freedombone
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

If cert bundles exist for websites then restore them

Bob Mottram 10 years ago
parent
1f5be365ad
commit
fe8de089d8
1 changed files with 40 additions and 0 deletions
Split View Show Diff Stats
  1. 40
    0
      src/freedombone

+ 40
- 0
src/freedombone View File 

@@ -2477,6 +2477,10 @@ function create_restore_script {
2477 2477 
       echo '    exit 683' >> /usr/bin/$RESTORE_SCRIPT_NAME
2478 2478 
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2479 2479 
       echo '  rm -rf /root/tempgnusocial' >> /usr/bin/$RESTORE_SCRIPT_NAME
2480 
+      echo '  # Ensure that the bundled SSL cert is being used' >> /usr/bin/$RESTORE_SCRIPT_NAME
2481 
+      echo "  if [ -f /etc/ssl/certs/$MICROBLOG_DOMAIN_NAME.bundle.crt ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
2482 
+      echo "    sed -i 's|$MICROBLOG_DOMAIN_NAME.crt|$MICROBLOG_DOMAIN_NAME.bundle.crt|g' /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
2483 
+      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2480 2484 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2481 2485 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
2482 2486 
   fi
 
@@ -2582,6 +2586,10 @@ function create_restore_script {
2582 2586 
       echo '  chown -R www-data:www-data /var/lib/owncloud/backup' >> /usr/bin/$RESTORE_SCRIPT_NAME
2583 2587 
       echo '  chown -R www-data:www-data /var/lib/owncloud/assets' >> /usr/bin/$RESTORE_SCRIPT_NAME
2584 2588 
       echo "  occ files:scan $MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
2589 
+      echo '  # Ensure that the bundled SSL cert is being used' >> /usr/bin/$RESTORE_SCRIPT_NAME
2590 
+      echo "  if [ -f /etc/ssl/certs/$OWNCLOUD_DOMAIN_NAME.bundle.crt ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
2591 
+      echo "    sed -i 's|$OWNCLOUD_DOMAIN_NAME.crt|$OWNCLOUD_DOMAIN_NAME.bundle.crt|g' /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
2592 
+      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2585 2593 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2586 2594 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
2587 2595 
   fi
 
@@ -2652,6 +2660,10 @@ function create_restore_script {
2652 2660 
       echo '  rm -rf /root/tempgogsrepos' >> /usr/bin/$RESTORE_SCRIPT_NAME
2653 2661 
       echo '  rm -rf /root/tempgogsssh' >> /usr/bin/$RESTORE_SCRIPT_NAME
2654 2662 
       echo '  chown -R git:git /home/git' >> /usr/bin/$RESTORE_SCRIPT_NAME
2663 
+      echo '  # Ensure that the bundled SSL cert is being used' >> /usr/bin/$RESTORE_SCRIPT_NAME
2664 
+      echo "  if [ -f /etc/ssl/certs/$GIT_DOMAIN_NAME.bundle.crt ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
2665 
+      echo "    sed -i 's|$GIT_DOMAIN_NAME.crt|$GIT_DOMAIN_NAME.bundle.crt|g' /etc/nginx/sites-available/$GIT_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
2666 
+      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2655 2667 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2656 2668 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
2657 2669 
   fi
 
@@ -2677,6 +2689,10 @@ function create_restore_script {
2677 2689 
   echo '  rm -rf /root/tempwiki' >> /usr/bin/$RESTORE_SCRIPT_NAME
2678 2690 
   echo '  rm -rf /root/tempwiki2' >> /usr/bin/$RESTORE_SCRIPT_NAME
2679 2691 
   echo '  chown -R www-data:www-data /var/lib/dokuwiki/*' >> /usr/bin/$RESTORE_SCRIPT_NAME
2692 
+  echo '  # Ensure that the bundled SSL cert is being used' >> /usr/bin/$RESTORE_SCRIPT_NAME
2693 
+  echo "  if [ -f /etc/ssl/certs/$WIKI_DOMAIN_NAME.bundle.crt ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
2694 
+  echo "    sed -i 's|$WIKI_DOMAIN_NAME.crt|$WIKI_DOMAIN_NAME.bundle.crt|g' /etc/nginx/sites-available/$WIKI_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
2695 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2680 2696 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2681 2697 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
2682 2698 
 
@@ -2699,6 +2715,10 @@ function create_restore_script {
2699 2715 
   echo '    exit 287' >> /usr/bin/$RESTORE_SCRIPT_NAME
2700 2716 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2701 2717 
   echo "  chown -R www-data:www-data /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /usr/bin/$RESTORE_SCRIPT_NAME
2718 
+  echo '  # Ensure that the bundled SSL cert is being used' >> /usr/bin/$RESTORE_SCRIPT_NAME
2719 
+  echo "  if [ -f /etc/ssl/certs/$FULLBLOG_DOMAIN_NAME.bundle.crt ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
2720 
+  echo "    sed -i 's|$FULLBLOG_DOMAIN_NAME.crt|$FULLBLOG_DOMAIN_NAME.bundle.crt|g' /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
2721 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2702 2722 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2703 2723 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
2704 2724 
 
@@ -3906,6 +3926,10 @@ function restore_from_friend {
3906 3926 
       echo '    exit 683' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3907 3927 
       echo '  fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3908 3928 
       echo '  rm -rf /root/tempgnusocial' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3929 
+      echo '  # Ensure that the bundled SSL cert is being used' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3930 
+      echo "  if [ -f /etc/ssl/certs/$MICROBLOG_DOMAIN_NAME.bundle.crt ]; then" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3931 
+      echo "    sed -i 's|$MICROBLOG_DOMAIN_NAME.crt|$MICROBLOG_DOMAIN_NAME.bundle.crt|g' /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3932 
+      echo '  fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3909 3933 
       echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3910 3934 
       echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
3911 3935 
   fi
 
@@ -4002,6 +4026,10 @@ function restore_from_friend {
4002 4026 
       echo '  chown -R www-data:www-data /var/lib/owncloud/backup' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4003 4027 
       echo '  chown -R www-data:www-data /var/lib/owncloud/assets' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4004 4028 
       echo "  occ files:scan $MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
4029 
+      echo '  # Ensure that the bundled SSL cert is being used' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4030 
+      echo "  if [ -f /etc/ssl/certs/$OWNCLOUD_DOMAIN_NAME.bundle.crt ]; then" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4031 
+      echo "    sed -i 's|$OWNCLOUD_DOMAIN_NAME.crt|$OWNCLOUD_DOMAIN_NAME.bundle.crt|g' /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4032 
+      echo '  fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4005 4033 
       echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4006 4034 
       echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4007 4035 
   fi
 
@@ -4066,6 +4094,10 @@ function restore_from_friend {
4066 4094 
       echo '  rm -rf /root/tempgogsrepos' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4067 4095 
       echo '  rm -rf /root/tempgogsssh' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4068 4096 
       echo '  chown -R git:git /home/git' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4097 
+      echo '  # Ensure that the bundled SSL cert is being used' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4098 
+      echo "  if [ -f /etc/ssl/certs/$GIT_DOMAIN_NAME.bundle.crt ]; then" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4099 
+      echo "    sed -i 's|$GIT_DOMAIN_NAME.crt|$GIT_DOMAIN_NAME.bundle.crt|g' /etc/nginx/sites-available/$GIT_DOMAIN_NAME" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4100 
+      echo '  fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4069 4101 
       echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4070 4102 
       echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4071 4103 
   fi
 
@@ -4089,6 +4121,10 @@ function restore_from_friend {
4089 4121 
   echo '  rm -rf /root/tempwiki' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4090 4122 
   echo '  rm -rf /root/tempwiki2' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4091 4123 
   echo '  chown -R www-data:www-data /var/lib/dokuwiki/*' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4124 
+  echo '  # Ensure that the bundled SSL cert is being used' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4125 
+  echo "  if [ -f /etc/ssl/certs/$WIKI_DOMAIN_NAME.bundle.crt ]; then" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4126 
+  echo "    sed -i 's|$WIKI_DOMAIN_NAME.crt|$WIKI_DOMAIN_NAME.bundle.crt|g' /etc/nginx/sites-available/$WIKI_DOMAIN_NAME" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4127 
+  echo '  fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4092 4128 
   echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4093 4129 
   echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4094 4130 
 
@@ -4107,6 +4143,10 @@ function restore_from_friend {
4107 4143 
   echo '    echo "No content directory found after restoring blog"' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4108 4144 
   echo '    exit 287' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4109 4145 
   echo '  fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4146 
+  echo '  # Ensure that the bundled SSL cert is being used' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4147 
+  echo "  if [ -f /etc/ssl/certs/$FULLBLOG_DOMAIN_NAME.bundle.crt ]; then" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4148 
+  echo "    sed -i 's|$FULLBLOG_DOMAIN_NAME.crt|$FULLBLOG_DOMAIN_NAME.bundle.crt|g' /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4149 
+  echo '  fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4110 4150 
   echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4111 4151 
   echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4112 4152