projects-timfalken-com verhalenboek
Merged
CI: tijdelijke diagnose-job weer weg
timfa
wants to merge
1 commit
from
cursor/remove-diagnose
into
master
Overview Commits 1 Pipelines 0 Changes 2
Activity
Commits
- CI: tijdelijke diagnose-job weer weg
1cb7ba5ff9timfa
Pipelines
No pipeline for this merge request.
Changes
@@ -53,19 +53,3 @@ ftp_upload:
53
53
script:
54
54
- python3 ci/deploy_guard.py
55
55
- python3 ci/deploy.py
56
57
# Read-only diagnosis of the live project folder (listing + .htaccess only). Manual, master only.
58
server_diagnose:
59
stage: deploy
60
image: debian:bookworm-slim
61
needs: []
62
rules:
63
- if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE != "merge_request_event"'
64
when: manual
65
allow_failure: true
66
before_script:
67
- apt-get update -qq
68
- apt-get install -y --no-install-recommends python3 lftp ca-certificates openssh-client
69
script:
70
- python3 ci/diagnose.py
71
@@ -53,19 +53,3 @@ ftp_upload:53
script:53
script:54
- python3 ci/deploy_guard.py54
- python3 ci/deploy_guard.py55
- python3 ci/deploy.py55
- python3 ci/deploy.py56
57
# Read-only diagnosis of the live project folder (listing + .htaccess only). Manual, master only.58
server_diagnose:59
stage: deploy60
image: debian:bookworm-slim61
needs: []62
rules:63
- if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE != "merge_request_event"'64
when: manual65
allow_failure: true66
before_script:67
- apt-get update -qq68
- apt-get install -y --no-install-recommends python3 lftp ca-certificates openssh-client69
script:70
- python3 ci/diagnose.py71
@@ -1,39 +0,0 @@
1
#!/usr/bin/env python3
2
"""Read-only server diagnosis: lists names/sizes/dates and shows .htaccess files.
3
Never downloads data (sqlite) or secrets; never writes. Password never enters argv."""
4
import os, subprocess, sys
5
from pathlib import Path
6
sys.path.insert(0, str(Path(__file__).resolve().parent))
7
from deploy_guard import project_dir # noqa: E402
8
from deploy import quoted # noqa: E402
9
from urllib.parse import urlsplit
10
11
def main():
12
e = os.environ
13
target = project_dir(e)
14
host = e['timftphost'] if '://' in e['timftphost'] else 'ftp://' + e['timftphost']
15
if not urlsplit(host).hostname:
16
print('bad host'); return 1
17
cmds = [
18
'set net:timeout 20', 'set net:max-retries 2', 'set ssl:verify-certificate no',
19
'set ftp:list-options -a',
20
'set sftp:connect-program "ssh -a -x -o StrictHostKeyChecking=accept-new"',
21
f'open --user {quoted(e["timftpuser"])} --env-password {quoted(host)}',
22
f'cd {quoted(target)}',
23
'echo "== project dir"', 'cls -l --sort=name',
24
'echo "== data"', 'cls -l data/',
25
'echo "== lib"', 'cls -l lib/',
26
'echo "== .htaccess"', 'cat .htaccess',
27
'echo "== data/.htaccess"', 'cat data/.htaccess',
28
'echo "== .user.ini"', 'cat .user.ini',
29
'echo "== parent dir"', 'cls -l ..',
30
'bye',
31
]
32
r = subprocess.run(['lftp', '--norc'], input='\n'.join(cmds) + '\n', text=True,
33
capture_output=True, env={**e, 'LFTP_PASSWORD': e['timftppassword']})
34
out = (r.stdout + r.stderr).replace(e['timftppassword'], '***').replace(e['timftpuser'], '<user>')
35
print(out)
36
return 0
37
38
if __name__ == '__main__':
39
sys.exit(main())
@@ -1,39 +0,0 @@1
#!/usr/bin/env python32
"""Read-only server diagnosis: lists names/sizes/dates and shows .htaccess files.3
Never downloads data (sqlite) or secrets; never writes. Password never enters argv."""4
import os, subprocess, sys5
from pathlib import Path6
sys.path.insert(0, str(Path(__file__).resolve().parent))7
from deploy_guard import project_dir # noqa: E4028
from deploy import quoted # noqa: E4029
from urllib.parse import urlsplit10
11
def main():12
e = os.environ13
target = project_dir(e)14
host = e['timftphost'] if '://' in e['timftphost'] else 'ftp://' + e['timftphost']15
if not urlsplit(host).hostname:16
print('bad host'); return 117
cmds = [18
'set net:timeout 20', 'set net:max-retries 2', 'set ssl:verify-certificate no',19
'set ftp:list-options -a',20
'set sftp:connect-program "ssh -a -x -o StrictHostKeyChecking=accept-new"',21
f'open --user {quoted(e["timftpuser"])} --env-password {quoted(host)}',22
f'cd {quoted(target)}',23
'echo "== project dir"', 'cls -l --sort=name',24
'echo "== data"', 'cls -l data/',25
'echo "== lib"', 'cls -l lib/',26
'echo "== .htaccess"', 'cat .htaccess',27
'echo "== data/.htaccess"', 'cat data/.htaccess',28
'echo "== .user.ini"', 'cat .user.ini',29
'echo "== parent dir"', 'cls -l ..',30
'bye',31
]32
r = subprocess.run(['lftp', '--norc'], input='\n'.join(cmds) + '\n', text=True,33
capture_output=True, env={**e, 'LFTP_PASSWORD': e['timftppassword']})34
out = (r.stdout + r.stderr).replace(e['timftppassword'], '***').replace(e['timftpuser'], '<user>')35
print(out)36
return 037
38
if __name__ == '__main__':39
sys.exit(main())