Update cert-up.sh

cert-up.sh

@@ -70,7 +70,13 @@ generateCrt () {
 updateService () {
   echo 'begin updateService'
   echo 'cp cert path to des'
-  /bin/python2 ${BASE_ROOT}/crt_cp.py ${CRT_PATH_NAME}
+  if [ `grep -c "$FIND_MAJORVERSION_STR" $FIND_MAJORVERSION_FILE` -ne '0' ];then
+    echo "MajorVersion = 7, use system default python2"
+    python2 ${BASE_ROOT}/crt_cp.py ${CRT_PATH_NAME}
+  else
+    echo "MajorVersion < 7"
+    /bin/python2 ${BASE_ROOT}/crt_cp.py ${CRT_PATH_NAME}
+  fi
   echo 'done updateService'
 }
 
@@ -79,15 +85,15 @@ reloadWebService () {
   echo 'reloading new cert...'
   if [ `grep -c "$FIND_MAJORVERSION_STR" $FIND_MAJORVERSION_FILE` -ne '0' ];then
     echo "MajorVersion = 7"
-    synosystemctl restart nginx
+    synow3tool --gen-all && systemctl reload nginx
   else
     echo "MajorVersion < 7"
     /usr/syno/etc/rc.sysv/nginx.sh reload
   fi
-  echo 'relading Apache 2.2'
-  stop pkg-apache22
-  start pkg-apache22
-  reload pkg-apache22
+  #echo 'relading Apache 2.2'
+  #stop pkg-apache22
+  #start pkg-apache22
+  #reload pkg-apache22
   echo 'done reloadWebService'  
 }