Upgrage etsicatalog to ensure interface support https protocol

Change-Id: Ida7318fa727096721d0b2f3e9a06dfb96c20c37d
Issue-ID: MODELING-372
Signed-off-by: dengyh <dengyuanhong@chinamobile.com>

diff --git a/docker/docker-env-conf.sh b/docker/docker-env-conf.sh
index 209e124..9f70fca 100755 (executable)
--- a/docker/docker-env-conf.sh
+++ b/docker/docker-env-conf.sh
@@ -4,7 +4,7 @@ install_sf(){
 
     apk --no-cache update
     apk --no-cache add bash curl gcc wget mysql-client openssl-dev
-    apk --no-cache add python36-dev libffi-dev musl-dev py3-virtualenv
+    apk --no-cache add python3-dev libffi-dev musl-dev py3-virtualenv
 
     # get binary zip from nexus - modeling-etsicatalog
 

diff --git a/requirements.txt b/requirements.txt
index 65354d4..63ea810 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -35,6 +35,6 @@ swagger-spec-validator>=2.1.0
 onappylog==1.0.9
 
 # uwsgi for parallel processing
-# uwsgi
+uwsgi
 
 apscheduler==2.1.2
\ No newline at end of file

diff --git a/run.sh b/run.sh
index 04b3052..410f26c 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -18,12 +18,11 @@ if [ ! -x  $logDir  ]; then
     mkdir -p $logDir
 fi
 
-nohup python manage.py runserver 0.0.0.0:8806 > /dev/null &
+# nohup python manage.py runserver 0.0.0.0:8806 > /dev/null &
 # nohup uwsgi --http :8806 -t 120 --module catalog.wsgi --master --processes 4 &
 
-
-# if [ "${SSL_ENABLED}" = "true" ]; then
-#     nohup uwsgi --https :8806,catalog/pub/ssl/cert/foobar.crt,catalog/pub/ssl/cert/foobar.key, -t 120 --enable-threads --module catalog.wsgi --master --processes 4 &
-# else
-#     nohup uwsgi --http :8806 -t 120 --enable-threads --module catalog.wsgi --master --processes 4 &
-# fi
+if [ "${SSL_ENABLED}" = "true" ]; then
+   nohup uwsgi --https :8806,catalog/pub/ssl/cert/foobar.crt,catalog/pub/ssl/cert/foobar.key, -t 120 --enable-threads --module catalog.wsgi --master --processes 4 &
+else
+   nohup uwsgi --http :8806 -t 120 --enable-threads --module catalog.wsgi --master --processes 4 &
+fi

diff --git a/stop.sh b/stop.sh
index f939ce5..f118622 100755 (executable)
--- a/stop.sh
+++ b/stop.sh
@@ -14,4 +14,10 @@
 # limitations under the License.
 
 # ps auxww | grep "manage.py runserver 0.0.0.0:8806" | awk '{print $1}' | xargs kill -9
-ps auxww |grep 'uwsgi --http' |awk '{print $1}' |xargs kill -9
+# ps auxww |grep 'uwsgi --http' |awk '{print $1}' |xargs kill -9
+
+if [ "${SSL_ENABLED}" = "true" ]; then
+    ps auxww |grep 'uwsgi --https :8806' |awk '{print $1}' |xargs kill -9
+else
+    ps auxww |grep 'uwsgi --http :8806' |awk '{print $1}' |xargs kill -9
+fi