Merge branch 'master' into patch-1

This commit is contained in:
Matteo ℱan 2020-02-11 23:10:17 +01:00 committed by GitHub
commit b878604c4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 2459 additions and 595 deletions

View file

@ -13,5 +13,4 @@ docker run -d --name py3-kms \
-e LOGSIZE=2 \
-v /etc/localtime:/etc/localtime:ro \
-v /var/log:/var/log:rw \
--restart unless-stopped pykms/pykms:py3-kms
# --restart unless-stopped ekonprof18/pykms:py3-kms
--restart unless-stopped pykms/pykms:py3-kms

View file

@ -39,7 +39,7 @@ else
if [ "$LOGSIZE" == "" ];
then
/bin/bash -c "/usr/bin/python3 pykms_Server.py ${IP} ${PORT} -e ${EPID} -l ${LCID} -c ${CLIENT_COUNT} -a ${ACTIVATION_INTERVAL} -r ${RENEWAL_INTERVAL} -s -w ${HWID} -V ${LOGLEVEL} -F ${LOGFILE} &"
sleep5
sleep 5
/usr/bin/python3 pykms_Client.py ${IP} ${PORT} -m Windows10 &
/usr/bin/python3 /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db --read-only
else