Skip to content

Commit

Permalink
Merge pull request #110 from Py-KMS-Organization/next
Browse files Browse the repository at this point in the history
Minor update
  • Loading branch information
simonmicro authored May 26, 2024
2 parents 35fbc76 + 9454447 commit e5f93ff
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 8 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ This version of _py-kms_ is for itself a fork of the original implementation by
- Uses `sqlite` for persistent data storage (with a simple web-based explorer).

## Documentation
The wiki has been completly reworked and is now available on [readthedocs.com](https://py-kms.readthedocs.io/en/latest/). It should you provide all necessary information how to setup and to use _py-kms_ , all without clumping this readme. The documentation also houses more details about activation with _py-kms_ and how to get GVLK keys.
The wiki has been completly reworked and is now available on [readthedocs.io](https://py-kms.readthedocs.io/en/latest/). It should provide you all the necessary information about how to setup and to use _py-kms_ , all without clumping this readme. The documentation also houses more details about activation with _py-kms_ and how to get GVLK keys.

## Quick start
- To start the server, execute `python3 pykms_Server.py [IPADDRESS] [PORT]`, the default _IPADDRESS_ is `::` ( all interfaces ) and the default _PORT_ is `1688`. Note that both the address and port are optional. It's allowed to use IPv4 and IPv6 addresses. If you have a IPv6-capable dual-stack OS, a dual-stack socket is created when using a IPv6 address. **In case your OS does not support IPv6, make sure to explicitly specify the legacy IPv4 of `0.0.0.0`!**
- To start the server automatically using Docker, execute `docker run -d --name py-kms --restart always -p 1688:1688 ghcr.io/py-kms-organization/py-kms`.
- To show the help pages type: `python3 pykms_Server.py -h` and `python3 pykms_Client.py -h`.

## License
- _py-kms_ is [![Unlicense](https://img.shields.io/badge/license-unlicense-lightgray.svg)](https://github.com/SystemRage/py-kms/blob/master/LICENSE)
- _py-kms_ is [![Unlicense](https://img.shields.io/badge/license-unlicense-lightgray.svg)](./LICENSE)
2 changes: 1 addition & 1 deletion docker/docker-py3-kms-minimal/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dnspython==2.2.1
dnspython==2.6.1
tzlocal==4.2
4 changes: 2 additions & 2 deletions docker/docker-py3-kms/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dnspython==2.2.1
dnspython==2.6.1
tzlocal==4.2

Flask==2.3.2
gunicorn==20.1.0
gunicorn==22.0.0
7 changes: 5 additions & 2 deletions docs/Getting Started.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ services:
kms:
image: ghcr.io/py-kms-organization/py-kms:python3
ports:
- 1688:1688
- 8080:8080
- 1688:1688 # kms
- 8080:8080 # web-interface
environment:
IP: "::"
HWID: RANDOM
Expand Down Expand Up @@ -193,6 +193,9 @@ user@host ~/path/to/folder/py-kms $ python3 pykms_Server.py 192.168.1.102 1688
To stop `pykms_Server.py`, in the same bash window where code running, simply press `CTRL+C`.
Alternatively, in a new bash window, use `kill <pid>` command (you can type `ps aux` first and have the process <pid>) or `killall <name_of_server>`.

### Web-Interface
As you may have noticed, the Docker container contains a web-interface, replacing the old GUI. If you want to launch it manually, checkout this [issue discussion](https://github.com/Py-KMS-Organization/py-kms/issues/100#issuecomment-1710827824) to learn more.

### Quick Guide
The following are just some brief notes about parameters handling. For a more detailed description see [here](Usage.md).

Expand Down
9 changes: 9 additions & 0 deletions py-kms/KmsDataBase.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@
<Activate KmsItem="7ba0bf23-d0f5-4072-91d9-d55af5a481b6" />
</CsvlkItem>

<CsvlkItem DisplayName="Windows Server 2022" VlmcsdIndex="0" GroupId="206" MinKeyId="551000000" MaxKeyId="570999999" IniFileName="Windows" EPid="06401-00206-566-174993-03-1033-9600.0000-2802018" Id="ef6cfc9f-8c5d-44ac-9aad-de6a2ea0ae03" InvalidWinBuild="[0,1,2]">
<Activate KmsItem="ef6cfc9f-8c5d-44ac-9aad-de6a2ea0ae03" />
</CsvlkItem>

<CsvlkItem DisplayName="Windows Server 2019" VlmcsdIndex="0" GroupId="206" MinKeyId="551000000" MaxKeyId="570999999" IniFileName="Windows" EPid="06401-00206-566-174993-03-1033-9600.0000-2802018" Id="2e7a9ad1-a849-4b56-babe-17d5a29fe4b4" InvalidWinBuild="[0,1,2]">
<Activate KmsItem="58e2134f-8e11-4d17-9cb2-91069c151148" />
<Activate KmsItem="7fde5219-fbfa-484a-82c9-34d1ad53e856" />
Expand Down Expand Up @@ -564,6 +568,11 @@

<AppItem DisplayName="Windows" VlmcsdIndex="0" Id="55c92734-d682-4d71-983e-d6ec3f16059f" MinActiveClients="50">

<KmsItem DisplayName="Windows Server 2022" Id="ef6cfc9f-8c5d-44ac-9aad-de6a2ea0ae03" DefaultKmsProtocol="6.0" NCountPolicy="5">
<SkuItem DisplayName="Windows Server 2022 Datacenter" Id="ef6cfc9f-8c5d-44ac-9aad-de6a2ea0ae03" Gvlk="WX4NM-KYWYW-QJJR4-XV3QB-6VM33" />
<SkuItem DisplayName="Windows Server 2022 Standard" Id="de32eafd-aaee-4662-9444-c1befb41bde2" Gvlk="VDYBN-27WPP-V4HQT-9VMD4-VMK7H" />
</KmsItem>

<KmsItem DisplayName="Windows Server 2019" Id="8449b1fb-f0ea-497a-99ab-66ca96e9a0f5" DefaultKmsProtocol="6.0" NCountPolicy="5">
<SkuItem DisplayName="Windows Server 2019 ARM64" Id="8de8eb62-bbe0-40ac-ac17-f75595071ea3" Gvlk="GRFBW-QNDC4-6QBHG-CCK3B-2PR88" />
<SkuItem DisplayName="Windows Server 2019 Azure Core" Id="a99cc1f0-7719-4306-9645-294102fbff95" Gvlk="FDNH6-VW9RW-BXPJ7-4XTYG-239TB" />
Expand Down
2 changes: 1 addition & 1 deletion py-kms/pykms_Server.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ def run(self):
'reuse' : {'help' : 'Do not allows binding / listening to the same address and port. Reusing port is activated by default.', 'def' : True,
'des': "reuse"},
'dual' : {'help' : 'Allows listening to an IPv6 address also accepting connections via IPv4. Deactivated by default.',
'def' : True, 'des': "dual"}
'def' : False, 'des': "dual"}
}

def server_options():
Expand Down

0 comments on commit e5f93ff

Please sign in to comment.