ScriptCollection 3.4.55__py3-none-any.whl → 3.4.57__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ScriptCollection/Executables.py +5 -11
- ScriptCollection/GeneralUtilities.py +16 -7
- ScriptCollection/ScriptCollectionCore.py +88 -99
- ScriptCollection/TasksForCommonProjectStructure.py +111 -199
- ScriptCollection/UpdateCertificates.py +4 -6
- {ScriptCollection-3.4.55.dist-info → ScriptCollection-3.4.57.dist-info}/METADATA +11 -11
- ScriptCollection-3.4.57.dist-info/RECORD +14 -0
- {ScriptCollection-3.4.55.dist-info → ScriptCollection-3.4.57.dist-info}/WHEEL +1 -1
- ScriptCollection-3.4.55.dist-info/RECORD +0 -14
- {ScriptCollection-3.4.55.dist-info → ScriptCollection-3.4.57.dist-info}/entry_points.txt +0 -0
- {ScriptCollection-3.4.55.dist-info → ScriptCollection-3.4.57.dist-info}/top_level.txt +0 -0
|
@@ -8,7 +8,7 @@ from .GeneralUtilities import GeneralUtilities
|
|
|
8
8
|
|
|
9
9
|
class CertificateUpdater:
|
|
10
10
|
|
|
11
|
-
__domains: list
|
|
11
|
+
__domains: list[str]
|
|
12
12
|
__email: str
|
|
13
13
|
|
|
14
14
|
__current_folder = os.path.dirname(os.path.abspath(__file__))
|
|
@@ -20,7 +20,7 @@ class CertificateUpdater:
|
|
|
20
20
|
__sc = ScriptCollectionCore()
|
|
21
21
|
__line = "___________________________________________________________________"
|
|
22
22
|
|
|
23
|
-
def __init__(self, domains: list
|
|
23
|
+
def __init__(self, domains: list[str], email: str):
|
|
24
24
|
self.__domains = domains
|
|
25
25
|
self.__email = email
|
|
26
26
|
|
|
@@ -109,12 +109,10 @@ class CertificateUpdater:
|
|
|
109
109
|
dockerargument = dockerargument+f" --volume {self.__log_folder}:/var/log/letsencrypt -p 80:80 certbot/certbot:latest"
|
|
110
110
|
certbotargument = f"--standalone --email {self.__email} --agree-tos --force-renewal --rsa-key-size 4096 --non-interactive --no-eff-email --domain {domain}"
|
|
111
111
|
if(certificate_for_domain_already_exists):
|
|
112
|
-
self.__sc.run_program("docker", f"{dockerargument} certonly --no-random-sleep-on-renew {certbotargument}",
|
|
113
|
-
self.__current_folder, throw_exception_if_exitcode_is_not_zero=True)
|
|
112
|
+
self.__sc.run_program("docker", f"{dockerargument} certonly --no-random-sleep-on-renew {certbotargument}", self.__current_folder, throw_exception_if_exitcode_is_not_zero=True)
|
|
114
113
|
self.__replace_symlinks_by_files(domain)
|
|
115
114
|
else:
|
|
116
|
-
self.__sc.run_program("docker", f"{dockerargument} certonly --cert-name {domain} {certbotargument}",
|
|
117
|
-
self.__current_folder, throw_exception_if_exitcode_is_not_zero=True)
|
|
115
|
+
self.__sc.run_program("docker", f"{dockerargument} certonly --cert-name {domain} {certbotargument}", self.__current_folder, throw_exception_if_exitcode_is_not_zero=True)
|
|
118
116
|
except Exception as exception:
|
|
119
117
|
GeneralUtilities.write_exception_to_stderr_with_traceback(exception, traceback, "Error while updating certificate")
|
|
120
118
|
finally:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: ScriptCollection
|
|
3
|
-
Version: 3.4.
|
|
3
|
+
Version: 3.4.57
|
|
4
4
|
Summary: The ScriptCollection is the place for reusable scripts.
|
|
5
5
|
Home-page: https://github.com/anionDev/ScriptCollection
|
|
6
6
|
Author: Marius Göcke
|
|
@@ -22,25 +22,25 @@ Classifier: Topic :: Terminals
|
|
|
22
22
|
Classifier: Topic :: Utilities
|
|
23
23
|
Requires-Python: >=3.10
|
|
24
24
|
Description-Content-Type: text/markdown
|
|
25
|
-
Requires-Dist: build >=1.
|
|
26
|
-
Requires-Dist: coverage >=7.
|
|
27
|
-
Requires-Dist: cyclonedx-bom >=
|
|
25
|
+
Requires-Dist: build >=1.1.1
|
|
26
|
+
Requires-Dist: coverage >=7.4.4
|
|
27
|
+
Requires-Dist: cyclonedx-bom >=4.1.3
|
|
28
28
|
Requires-Dist: defusedxml >=0.7.1
|
|
29
29
|
Requires-Dist: keyboard >=0.13.5
|
|
30
30
|
Requires-Dist: lcov-cobertura >=2.0.2
|
|
31
|
-
Requires-Dist: lxml >=
|
|
31
|
+
Requires-Dist: lxml >=5.1.0
|
|
32
32
|
Requires-Dist: ntplib >=0.4.0
|
|
33
|
-
Requires-Dist: Pillow >=10.
|
|
33
|
+
Requires-Dist: Pillow >=10.2.0
|
|
34
34
|
Requires-Dist: pycdlib >=1.14.0
|
|
35
35
|
Requires-Dist: Pygments >=2.17.2
|
|
36
|
-
Requires-Dist: pylint >=3.0
|
|
37
|
-
Requires-Dist: pyOpenSSL >=
|
|
36
|
+
Requires-Dist: pylint >=3.1.0
|
|
37
|
+
Requires-Dist: pyOpenSSL >=24.1.0
|
|
38
38
|
Requires-Dist: PyPDF2 >=3.0.1
|
|
39
|
-
Requires-Dist: pytest >=
|
|
39
|
+
Requires-Dist: pytest >=8.1.1
|
|
40
40
|
Requires-Dist: qrcode >=7.4.2
|
|
41
41
|
Requires-Dist: send2trash >=1.8.2
|
|
42
|
-
Requires-Dist: twine >=
|
|
43
|
-
Requires-Dist: xmlschema >=
|
|
42
|
+
Requires-Dist: twine >=5.0.0
|
|
43
|
+
Requires-Dist: xmlschema >=3.1.0
|
|
44
44
|
|
|
45
45
|
# ScriptCollection
|
|
46
46
|
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
ScriptCollection/Executables.py,sha256=F8ar_pRplVZm0mHLJ_Ono5HKTfqr6wTceG3Hcbx_tow,19282
|
|
2
|
+
ScriptCollection/GeneralUtilities.py,sha256=Mcp6ghb6AbS1KsOjEnRw3x4a4mBrAZ6DAjV2j8-LZFM,35589
|
|
3
|
+
ScriptCollection/ProgramRunnerBase.py,sha256=2kyOuoM3oFjBfLc9Q5t5RTz7Ya2CjUxFtB1rBBDmnjU,1937
|
|
4
|
+
ScriptCollection/ProgramRunnerEpew.py,sha256=nIzY4dG6W-xEpkeoTbozwNZtFSIo-bU_W6t6u1AZKtE,6275
|
|
5
|
+
ScriptCollection/ProgramRunnerPopen.py,sha256=veDNRg2Z0u0vd4iKWAycVFKbTm_uWYfuK6NTiwlbgrM,3230
|
|
6
|
+
ScriptCollection/ScriptCollectionCore.py,sha256=M2Lv_y0noEiyIOxmPSo6R2Chg9VBEqOdkrUik3MZQKQ,95610
|
|
7
|
+
ScriptCollection/TasksForCommonProjectStructure.py,sha256=S7dANrdvnJ6zbXKXmVCMMT73HlQS7dE0Zy5jphH5-6w,164596
|
|
8
|
+
ScriptCollection/UpdateCertificates.py,sha256=3C_E9og5SZec35aD3BFYLchzJtonsg1KR4enFCb5Jzk,7914
|
|
9
|
+
ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
10
|
+
ScriptCollection-3.4.57.dist-info/METADATA,sha256=u1qVrBziH5E3E2hbxv3BjYmNxbWzlyQbVkYO3CzI4hY,7649
|
|
11
|
+
ScriptCollection-3.4.57.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
|
|
12
|
+
ScriptCollection-3.4.57.dist-info/entry_points.txt,sha256=dwvB9HRGvqst5xlYIGmmwuFN7lBKhxvndmnNrQOfu8w,2153
|
|
13
|
+
ScriptCollection-3.4.57.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
14
|
+
ScriptCollection-3.4.57.dist-info/RECORD,,
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
ScriptCollection/Executables.py,sha256=04o5UhEHwtJc0W_WizZMQ9YbRUQalxy5TFGS8LH8suo,19294
|
|
2
|
-
ScriptCollection/GeneralUtilities.py,sha256=m4tR0CGUeVBwFbZdVWYczvbkDsO3Oi0J6Dj8cplXVDE,35267
|
|
3
|
-
ScriptCollection/ProgramRunnerBase.py,sha256=2kyOuoM3oFjBfLc9Q5t5RTz7Ya2CjUxFtB1rBBDmnjU,1937
|
|
4
|
-
ScriptCollection/ProgramRunnerEpew.py,sha256=nIzY4dG6W-xEpkeoTbozwNZtFSIo-bU_W6t6u1AZKtE,6275
|
|
5
|
-
ScriptCollection/ProgramRunnerPopen.py,sha256=veDNRg2Z0u0vd4iKWAycVFKbTm_uWYfuK6NTiwlbgrM,3230
|
|
6
|
-
ScriptCollection/ScriptCollectionCore.py,sha256=ZIZgDZ6t7mF-jBtAzJdctiC9b-vLPcd5hX0Csu5MOoQ,94128
|
|
7
|
-
ScriptCollection/TasksForCommonProjectStructure.py,sha256=qu3XbyM7TD-KUcnOKnXfxRZvJwhRrY5--ZnBHEDTDTQ,167287
|
|
8
|
-
ScriptCollection/UpdateCertificates.py,sha256=Go-JJK-YTi7aBB1phlLxypa8GHkmFHBEPB0_TT9G-bw,7918
|
|
9
|
-
ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
10
|
-
ScriptCollection-3.4.55.dist-info/METADATA,sha256=ocWeG8ay_5GGNFKKyWOurMClBrst5zfQ2zRFMsXVgHc,7650
|
|
11
|
-
ScriptCollection-3.4.55.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
|
|
12
|
-
ScriptCollection-3.4.55.dist-info/entry_points.txt,sha256=dwvB9HRGvqst5xlYIGmmwuFN7lBKhxvndmnNrQOfu8w,2153
|
|
13
|
-
ScriptCollection-3.4.55.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
14
|
-
ScriptCollection-3.4.55.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|