Browse Source

Peg nginx-ensite to a commit

Bob Mottram 9 years ago
parent
commit
2c7bca82b6
1 changed files with 40 additions and 2 deletions
  1. 40
    2
      src/freedombone

+ 40
- 2
src/freedombone View File

94
 DDNS_PASSWORD=
94
 DDNS_PASSWORD=
95
 CURRENT_DDNS_DOMAIN=
95
 CURRENT_DDNS_DOMAIN=
96
 
96
 
97
+NGINX_ENSITE_REPO="https://github.com/perusio/nginx_ensite"
98
+NGINX_ENSITE_COMMIT='fa4d72ce1c0a490442c8474e9c8dc21ed52c93d0'
99
+
97
 CLEANUP_MAILDIR_REPO="https://github.com/bashrc/cleanup-maildir"
100
 CLEANUP_MAILDIR_REPO="https://github.com/bashrc/cleanup-maildir"
98
 CLEANUP_MAILDIR_COMMIT='33241d2e3861f901ba17f5c77ada007e1ec06a86'
101
 CLEANUP_MAILDIR_COMMIT='33241d2e3861f901ba17f5c77ada007e1ec06a86'
99
 
102
 
891
       if grep -q "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE; then
894
       if grep -q "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE; then
892
           GNUSOCIAL_COMMIT=$(grep "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
895
           GNUSOCIAL_COMMIT=$(grep "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
893
       fi
896
       fi
897
+      if grep -q "NGINX_ENSITE_REPO" $CONFIGURATION_FILE; then
898
+          NGINX_ENSITE_REPO=$(grep "NGINX_ENSITE_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
899
+      fi
900
+      if grep -q "NGINX_ENSITE_COMMIT" $CONFIGURATION_FILE; then
901
+          NGINX_ENSITE_COMMIT=$(grep "NGINX_ENSITE_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
902
+      fi
894
       if grep -q "CLEANUP_MAILDIR_COMMIT" $CONFIGURATION_FILE; then
903
       if grep -q "CLEANUP_MAILDIR_COMMIT" $CONFIGURATION_FILE; then
895
           CLEANUP_MAILDIR_COMMIT=$(grep "CLEANUP_MAILDIR_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
904
           CLEANUP_MAILDIR_COMMIT=$(grep "CLEANUP_MAILDIR_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
896
       fi
905
       fi
8078
               git checkout $CLEANUP_MAILDIR_COMMIT
8087
               git checkout $CLEANUP_MAILDIR_COMMIT
8079
               git checkout -b $CLEANUP_MAILDIR_COMMIT
8088
               git checkout -b $CLEANUP_MAILDIR_COMMIT
8080
               sed -i "s/cleanup-maildir commit.*/cleanup-maildir commit:$CLEANUP_MAILDIR_COMMIT/g" $COMPLETION_FILE
8089
               sed -i "s/cleanup-maildir commit.*/cleanup-maildir commit:$CLEANUP_MAILDIR_COMMIT/g" $COMPLETION_FILE
8090
+              cp $INSTALL_DIR/cleanup-maildir/cleanup-maildir /usr/bin
8081
           fi
8091
           fi
8082
       else
8092
       else
8083
           echo "cleanup-maildir commit:$GNUSOCIAL_COMMIT" >> $COMPLETION_FILE
8093
           echo "cleanup-maildir commit:$GNUSOCIAL_COMMIT" >> $COMPLETION_FILE
8092
       mkdir $INSTALL_DIR
8102
       mkdir $INSTALL_DIR
8093
   fi
8103
   fi
8094
   cd $INSTALL_DIR
8104
   cd $INSTALL_DIR
8095
-  git clone $CLEANUP_MAILDIR_REPO
8105
+  git clone $CLEANUP_MAILDIR_REPO $INSTALL_DIR/cleanup-maildir
8096
   git checkout $CLEANUP_MAILDIR_COMMIT
8106
   git checkout $CLEANUP_MAILDIR_COMMIT
8097
   git checkout -b $CLEANUP_MAILDIR_COMMIT
8107
   git checkout -b $CLEANUP_MAILDIR_COMMIT
8098
   if ! grep -q "cleanup-maildir commit" $COMPLETION_FILE; then
8108
   if ! grep -q "cleanup-maildir commit" $COMPLETION_FILE; then
8374
   if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" ]]; then
8384
   if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" ]]; then
8375
       return
8385
       return
8376
   fi
8386
   fi
8387
+
8388
+  # update to the next commit
8389
+  if [ -d $INSTALL_DIR/nginx_ensite ]; then
8390
+      if grep -q "Nginx-ensite commit" $COMPLETION_FILE; then
8391
+          CURRENT_GNUSOCIAL_COMMIT=$(grep "Nginx-ensite commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
8392
+          if [[ "$CURRENT_NGINX_ENSITE_COMMIT" != "$NGINX_ENSITE_COMMIT" ]]; then
8393
+              cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8394
+              git stash
8395
+              git checkout master
8396
+              git pull
8397
+              git checkout $NGINX_ENSITE_COMMIT
8398
+              git checkout -b $NGINX_ENSITE_COMMIT
8399
+              sed -i "s/Nginx-ensite commit.*/Nginx-ensite commit:$NGINX_ENSITE_COMMIT/g" $COMPLETION_FILE
8400
+              make install
8401
+          fi
8402
+      else
8403
+          echo "Nginx-ensite commit:$NGINX_ENSITE_COMMIT" >> $COMPLETION_FILE
8404
+      fi
8405
+  fi
8406
+
8377
   if grep -Fxq "install_web_server" $COMPLETION_FILE; then
8407
   if grep -Fxq "install_web_server" $COMPLETION_FILE; then
8378
       return
8408
       return
8379
   fi
8409
   fi
8485
       mkdir $INSTALL_DIR
8515
       mkdir $INSTALL_DIR
8486
   fi
8516
   fi
8487
   cd $INSTALL_DIR
8517
   cd $INSTALL_DIR
8488
-  git clone https://github.com/perusio/nginx_ensite
8518
+  git clone $NGINX_ENSITE_REPO $INSTALL_DIR/nginx_ensite
8489
   cd $INSTALL_DIR/nginx_ensite
8519
   cd $INSTALL_DIR/nginx_ensite
8520
+  git checkout $NGINX_ENSITE_COMMIT
8521
+  git checkout -b $NGINX_ENSITE_COMMIT
8522
+  if ! grep -q "Nginx-ensite commit" $COMPLETION_FILE; then
8523
+      echo "Nginx-ensite commit:$NGINX_ENSITE_COMMIT" >> $COMPLETION_FILE
8524
+  else
8525
+      sed -i "s/Nginx-ensite commit.*/Nginx-ensite commit:$NGINX_ENSITE_COMMIT/g" $COMPLETION_FILE
8526
+  fi
8527
+
8490
   make install
8528
   make install
8491
   nginx_dissite default
8529
   nginx_dissite default
8492
   echo 'install_web_server' >> $COMPLETION_FILE
8530
   echo 'install_web_server' >> $COMPLETION_FILE