sysadmin/openfreemap
1
0
Fork 0
mirror of https://github.com/hyperknot/openfreemap.git synced 2026-05-21 14:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

work

Browse Source
This commit is contained in:
Zsolt Ero
2025-10-03 23:27:02 +02:00
parent d735f4975f
commit 6eb32db16a
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
config/config.schema.json
View File

@@ -3,6 +3,9 @@
"type": "object", "type": "object",
"additionalProperties": false, "additionalProperties": false,
"properties": { "properties": {
"$schema": {
"type": "string"
},
"domains": { "domains": {
"type": "array", "type": "array",
"minItems": 1, "minItems": 1,
@@ -20,6 +23,20 @@
}, },
"required": ["domains", "servers", "skip_planet"], "required": ["domains", "servers", "skip_planet"],
"definitions": { "definitions": {
"cert-upload": {
"type": "object",
"description": "Upload your own certificate. Ideal for Cloudflare Origin Certificates with 15 year expiry. Steps: 1) Create an Origin Certificate on Cloudflare at SSL/TLS / Origin Server. 2) Generate private key and CSR with Cloudflare: Private key type: ECC, Certificate Validity: 15 years. 3) Key format: PEM. Save origin certificate as something.cert and private key as something.key in the dirname folder.",
"additionalProperties": false,
"properties": {
"type": { "const": "upload" },
"dirname": {
"type": "string",
"minLength": 1,
"description": "Directory name containing your certificate (.cert) and private key (.key) files"
}
},
"required": ["type", "dirname"]
},
"cert-letsencrypt": { "cert-letsencrypt": {
"type": "object", "type": "object",
"additionalProperties": false, "additionalProperties": false,
@@ -37,20 +54,11 @@
}, },
"required": ["type"] "required": ["type"]
}, },
"cert-upload": {
"type": "object",
"additionalProperties": false,
"properties": {
"type": { "const": "upload" },
"dirname": { "type": "string", "minLength": 1 }
},
"required": ["type", "dirname"]
},
"cert": { "cert": {
"oneOf": [ "oneOf": [
{ "$ref": "#/definitions/cert-upload" },
{ "$ref": "#/definitions/cert-letsencrypt" }, { "$ref": "#/definitions/cert-letsencrypt" },
{ "$ref": "#/definitions/cert-dummy" }, { "$ref": "#/definitions/cert-dummy" }
{ "$ref": "#/definitions/cert-upload" }
] ]
}, },
"domain": { "domain": {
@@ -66,20 +74,16 @@
"type": "object", "type": "object",
"additionalProperties": false, "additionalProperties": false,
"properties": { "properties": {
"name": { "hostname": {
"type": "string", "type": "string",
"pattern": "^[a-zA-Z0-9-]+$" "description": "hostname used for ssh to connect. can be an IP address"
},
"ip": {
"type": "string",
"format": "ipv4"
}, },
"server_ssh_passwd": { "server_ssh_passwd": {
"type": "string", "type": "string",
"description": "Leave this empty if you use SSH keys" "description": "Leave this empty if you use SSH keys"
} }
}, },
"required": ["name", "ip"] "required": ["hostname"]
} }
} }
} }

2
ssh_lib/pkg_base.py
View File

@@ -38,7 +38,7 @@ def pkg_base(c):
'autojump', 'autojump',
'bash-completion', 'bash-completion',
'btop', 'btop',
'ctop', # 'ctop', # unsupported on Ubuntu 24
'dbus', 'dbus',
'direnv', 'direnv',
'fd-find', 'fd-find',