diff options
| author |   dengyh <dengyuanhong@chinamobile.com> | 2020-06-18 09:50:39 +0800 |
|---|---|---|
| committer | dengyh <dengyuanhong@chinamobile.com> | 2020-06-18 09:50:44 +0800 |
| commit | 1f9fde9ca711a6ce22bb4424b8f2667a553a4aa0 (patch) | |
| tree | e540c0acc9d92f1b20dd094dd488ff0a0822fd9a | |
| parent | 6ffe1ecc8f0d52d7546ff640d275748ba21ff00c (diff) | |
Upgrage etsicatalog to ensure interface support https protocol
Change-Id: Ida7318fa727096721d0b2f3e9a06dfb96c20c37d
Issue-ID: MODELING-372
Signed-off-by: dengyh <dengyuanhong@chinamobile.com>
| -rwxr-xr-x | docker/docker-env-conf.sh | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rwxr-xr-x | run.sh | 13 | ||||
| -rwxr-xr-x | stop.sh | 8 |
4 files changed, 15 insertions, 10 deletions
diff --git a/docker/docker-env-conf.sh b/docker/docker-env-conf.sh index 209e124..9f70fca 100755 --- 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 --- 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 @@ -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 @@ -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 |