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

@ -50,7 +50,7 @@ ENV SQLITE false
# EN: hwid
# RU: hwid
ENV HWID 364F463A8863D35F
ENV HWID "364F463A8863D35F"
# Use this flag to specify a HWID.
# The HWID must be an 16-character string of hex characters.
# The default is "364F463A8863D35F" or type "RANDOM" to auto generate the HWID.
@ -107,7 +107,7 @@ chmod a+x /usr/bin/start.sh && \
# EN: Clear after install software
# RU: Очистка после установки программного обеспечения
apk del git py2-pip
apk del git
# Set Workdir
WORKDIR /home/py-kms

View file

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

View file

@ -27,25 +27,25 @@ else
then
/bin/bash -c "/usr/bin/python pykms_Server.py ${IP} ${PORT} -l ${LCID} -c ${CLIENT_COUNT} -a ${ACTIVATION_INTERVAL} -r ${RENEWAL_INTERVAL} -s -w ${HWID} -V ${LOGLEVEL} -F ${LOGFILE} &"
sleep 5
/usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows10 &
/usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows7 &
/usr/bin/python /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db
else
/bin/bash -c "/usr/bin/python pykms_Server.py ${IP} ${PORT} -l ${LCID} -c ${CLIENT_COUNT} -a ${ACTIVATION_INTERVAL} -r ${RENEWAL_INTERVAL} -s -w ${HWID} -V ${LOGLEVEL} -F ${LOGFILE} -S ${LOGSIZE} &"
sleep 5
/usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows10 &
/usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows7 &
/usr/bin/python /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db
fi
else
if [ "$LOGSIZE" == "" ];
then
/bin/bash -c "/usr/bin/python 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
/usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows10 &
sleep 5
/usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows7 &
/usr/bin/python /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db
else
/bin/sh -c "/usr/bin/python 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} -S ${LOGSIZE} &"
sleep 5
/usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows10 &
/usr/bin/python pykms_Client.py ${IP} ${PORT} -m Windows7 &
/usr/bin/python /home/sqlite_web/sqlite_web.py -H ${IP} -x ${PWD}/clients.db
fi
fi