tjh.dev
1From 17a1e09eaf8957174425d05200be9ee3e77229f9 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
3Date: Thu, 21 Oct 2021 00:39:08 +0200
4Subject: [PATCH] Remove system-state changing code
5
6This is already done by the module on nixOS
7---
8 lxd_image_server/cli.py | 15 +--------------
9 1 file changed, 1 insertion(+), 14 deletions(-)
10
11diff --git a/lxd_image_server/cli.py b/lxd_image_server/cli.py
12index d276e6d..f759bf2 100644
13--- a/lxd_image_server/cli.py
14+++ b/lxd_image_server/cli.py
15@@ -140,30 +140,17 @@ def reload_config():
16 @cli.command()
17 @click.option('--root_dir', default='/var/www/simplestreams',
18 show_default=True)
19-@click.option('--ssl_dir', default='/etc/nginx/ssl', show_default=True,
20- callback=lambda ctx, param, val: Path(val))
21 @click.pass_context
22-def init(ctx, root_dir, ssl_dir):
23+def init(ctx, root_dir):
24 if not Path(root_dir).exists():
25 logger.error('Root directory does not exists')
26 else:
27- if not ssl_dir.exists():
28- os.makedirs(str(ssl_dir))
29-
30- if not (ssl_dir / 'nginx.key').exists():
31- generate_cert(str(ssl_dir))
32-
33 img_dir = str(Path(root_dir, 'images'))
34 streams_dir = str(Path(root_dir, 'streams/v1'))
35 if not Path(img_dir).exists():
36 os.makedirs(img_dir)
37 if not Path(streams_dir).exists():
38 os.makedirs(streams_dir)
39- conf_path = Path('/etc/nginx/sites-enabled/simplestreams.conf')
40- if not conf_path.exists():
41- conf_path.symlink_to(
42- '/etc/nginx/sites-available/simplestreams.conf')
43- os.system('nginx -s reload')
44
45 if not Path(root_dir, 'streams', 'v1', 'images.json').exists():
46 ctx.invoke(update, img_dir=Path(root_dir, 'images'),
47--
482.33.0
49