Skip to content

Commit c7b06f9

Browse files
committed
feat: added http2https
1 parent e932faa commit c7b06f9

2 files changed

Lines changed: 37 additions & 27 deletions

File tree

imageroot/actions/configure-module/20configure

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,29 @@ h2hs = data.get("http2https", True)
2323
# Setup configuration from user input.
2424
agent.set_env("TRAEFIK_HOST", host)
2525
agent.set_env("TRAEFIK_LETS_ENCRYPT", le)
26+
agent.set_env("TRAEFIK_HTTP2HTTPS", h2hs)
2627

2728
# Make sure everything is saved inside the environment file
2829
# just before starting systemd unit
2930
agent.dump_env()
3031

3132
# Find default traefik instance for current node
32-
default_traefik_id = agent.resolve_agent_id('traefik@node')
33+
default_traefik_id = agent.resolve_agent_id("traefik@node")
3334
if default_traefik_id is None:
3435
sys.exit(2)
3536

3637
response = agent.tasks.run(
37-
agent_id=agent.resolve_agent_id('traefik@node'),
38-
action='set-route',
38+
agent_id=agent.resolve_agent_id("traefik@node"),
39+
action="set-route",
3940
data={
40-
'instance': os.environ['MODULE_ID'],
41-
'url': 'http://127.0.0.1:' + os.environ["TCP_PORT"],
42-
'host': host,
43-
'http2https': True,
44-
'lets_encrypt': le
41+
"instance": os.environ["MODULE_ID"],
42+
"url": "http://127.0.0.1:" + os.environ["TCP_PORT"],
43+
"host": host,
44+
"http2https": True,
45+
"lets_encrypt": le,
4546
},
4647
)
4748

4849
# Check if traefik configuration has been successfull
49-
agent.assert_exp(response['exit_code'] == 0)
50+
agent.assert_exp(response["exit_code"] == 0)
51+

imageroot/actions/get-configuration/20read

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,47 @@ from agent.ldapproxy import Ldapproxy
1010
config = {}
1111

1212
# Read current configuration from the environment file
13-
config["host"] = os.getenv("TRAEFIK_HOST","")
13+
config["host"] = os.getenv("TRAEFIK_HOST", "")
1414
config["lets_encrypt"] = os.getenv("TRAEFIK_LETS_ENCRYPT") == "True"
15-
config["matomo_database_username"] = os.getenv("MATOMO_DATABASE_USERNAME","matomo")
16-
config["matomo_database_password"] = os.getenv("MATOMO_DATABASE_PASSWORD","Matomo,1234")
17-
config["matomo_database_dbname"] = os.getenv("MATOMO_DATABASE_DBNAME","matomo")
18-
config["matomo_database_host"] = os.getenv("MATOMO_DATABASE_HOST","")
15+
config["http2https"] = os.getenv("TRAEFIK_HTTP2HTTPS") == "True"
16+
config["matomo_database_username"] = os.getenv("MATOMO_DATABASE_USERNAME", "matomo")
17+
config["matomo_database_password"] = os.getenv(
18+
"MATOMO_DATABASE_PASSWORD", "Matomo,1234"
19+
)
20+
config["matomo_database_dbname"] = os.getenv("MATOMO_DATABASE_DBNAME", "matomo")
21+
config["matomo_database_host"] = os.getenv("MATOMO_DATABASE_HOST", "")
1922
config["mariadb_auto_upgrade"] = os.getenv("MARIADB_AUTO_UPGRADE") == "1"
20-
config["mariadb_disable_upgrade_backup"] = os.getenv("MARIADB_DISABLE_UPGRADE_BACKUP") == "1"
21-
config["matomo_database_tables_prefix"] = os.getenv("MATOMO_DATABASE_TABLES_PREFIX","")
22-
config["matomo_database_adapter"] = os.getenv("MATOMO_DATABASE_ADAPTER","")
23+
config["mariadb_disable_upgrade_backup"] = (
24+
os.getenv("MARIADB_DISABLE_UPGRADE_BACKUP") == "1"
25+
)
26+
config["matomo_database_tables_prefix"] = os.getenv("MATOMO_DATABASE_TABLES_PREFIX", "")
27+
config["matomo_database_adapter"] = os.getenv("MATOMO_DATABASE_ADAPTER", "")
2328

2429

25-
rdb = agent.redis_connect() # full read-only access on every key
30+
rdb = agent.redis_connect() # full read-only access on every key
2631

27-
modules=[]
32+
modules = []
2833
tmp = []
2934

3035
# retrieve installed modules list
3136
for key in rdb.scan_iter("module:*"):
3237
tmp.append(key.decode("utf-8"))
33-
38+
3439
# retrieve LDAP domains list
3540
lp = Ldapproxy()
3641
domains = []
3742
for key in lp.get_domains_list():
38-
domains.append({
39-
"name": key,
40-
"label": key,
41-
"value": key,
42-
})
43+
domains.append(
44+
{
45+
"name": key,
46+
"label": key,
47+
"value": key,
48+
}
49+
)
4350

44-
config['user_domains_list'] = domains
51+
config["user_domains_list"] = domains
4552

4653

4754
# Dump the configuration to stdout
48-
json.dump(config, fp=sys.stdout)
55+
json.dump(config, fp=sys.stdout)
56+

0 commit comments

Comments
 (0)