From d03f84644deb7e2bb0b050761c418b16660a22a6 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Mon, 2 Mar 2020 17:05:15 +0100 Subject: [PATCH] Move again, re-add Jinja2 --- Pipfile | 1 + Pipfile.lock | 63 ++++++++++++++++--- {gvacommon => gvaweb/gvacommon}/.gitignore | 0 {gvacommon => gvaweb/gvacommon}/__init__.py | 0 .../gvacommon}/celeryrouters.py | 0 gvaweb/{ => gvaweb}/__init__.py | 0 gvaweb/{ => gvaweb}/settings.py | 0 gvaweb/{ => gvaweb}/webtasks/__init__.py | 0 gvaweb/{ => gvaweb}/webtasks/tasks.py | 12 ---- .../webtasks/templates/vhost.nginx | 0 gvaweb/webtasks/templates/fpmpool.conf | 15 ----- 11 files changed, 56 insertions(+), 35 deletions(-) rename {gvacommon => gvaweb/gvacommon}/.gitignore (100%) rename {gvacommon => gvaweb/gvacommon}/__init__.py (100%) rename {gvacommon => gvaweb/gvacommon}/celeryrouters.py (100%) rename gvaweb/{ => gvaweb}/__init__.py (100%) rename gvaweb/{ => gvaweb}/settings.py (100%) rename gvaweb/{ => gvaweb}/webtasks/__init__.py (100%) rename gvaweb/{ => gvaweb}/webtasks/tasks.py (92%) rename gvaweb/{ => gvaweb}/webtasks/templates/vhost.nginx (100%) delete mode 100644 gvaweb/webtasks/templates/fpmpool.conf diff --git a/Pipfile b/Pipfile index 9facfc2..b0f65c6 100644 --- a/Pipfile +++ b/Pipfile @@ -14,6 +14,7 @@ anyjson = "*" celery = "*" kombu = "*" pytz = "*" +jinja2 = "*" [requires] python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock index 7b1b109..5bb48e7 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "fbfced5a6f05b5d2856d21371fe917f80dcdcfd72d21e53eab8444877b53cf52" + "sha256": "4420e939c194bdd75c095801149c37d0eb28c9e3010e20e701ee8d95e81b0a52" }, "pipfile-spec": 6, "requires": { @@ -40,11 +40,11 @@ }, "celery": { "hashes": [ - "sha256:7c544f37a84a5eadc44cab1aa8c9580dff94636bb81978cdf9bf8012d9ea7d8f", - "sha256:d3363bb5df72d74420986a435449f3c3979285941dff57d5d97ecba352a0e3e2" + "sha256:3c5fcd6bfcf9a6323cb742cfc121d1790d50cfeddf300ba723cfa0b356413f07", + "sha256:a650525303ee866fb0c62c82f68681fcc2183eebbfafae552c27d30125fe518b" ], "index": "pypi", - "version": "==4.4.0" + "version": "==4.4.1" }, "importlib-metadata": { "hashes": [ @@ -54,13 +54,59 @@ "markers": "python_version < '3.8'", "version": "==1.5.0" }, - "kombu": { + "jinja2": { "hashes": [ - "sha256:2a9e7adff14d046c9996752b2c48b6d9185d0b992106d5160e1a179907a5d4ac", - "sha256:67b32ccb6fea030f8799f8fd50dd08e03a4b99464ebc4952d71d8747b1a52ad1" + "sha256:93187ffbc7808079673ef52771baa950426fd664d3aad1d0fa3e95644360e250", + "sha256:b0eaf100007721b5c16c1fc1eecb87409464edc10469ddc9a22a27a99123be49" ], "index": "pypi", - "version": "==4.6.7" + "version": "==2.11.1" + }, + "kombu": { + "hashes": [ + "sha256:2d1cda774126a044d91a7ff5fa6d09edf99f46924ab332a810760fe6740e9b76", + "sha256:598e7e749d6ab54f646b74b2d2df67755dee13894f73ab02a2a9feb8870c7cb2" + ], + "index": "pypi", + "version": "==4.6.8" + }, + "markupsafe": { + "hashes": [ + "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", + "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", + "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", + "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", + "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", + "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", + "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", + "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", + "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", + "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", + "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", + "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b", + "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", + "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", + "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", + "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", + "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", + "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", + "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", + "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", + "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", + "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", + "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", + "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", + "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", + "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", + "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", + "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", + "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", + "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", + "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", + "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", + "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" + ], + "version": "==1.1.1" }, "pytz": { "hashes": [ @@ -177,6 +223,7 @@ "sha256:93187ffbc7808079673ef52771baa950426fd664d3aad1d0fa3e95644360e250", "sha256:b0eaf100007721b5c16c1fc1eecb87409464edc10469ddc9a22a27a99123be49" ], + "index": "pypi", "version": "==2.11.1" }, "markupsafe": { diff --git a/gvacommon/.gitignore b/gvaweb/gvacommon/.gitignore similarity index 100% rename from gvacommon/.gitignore rename to gvaweb/gvacommon/.gitignore diff --git a/gvacommon/__init__.py b/gvaweb/gvacommon/__init__.py similarity index 100% rename from gvacommon/__init__.py rename to gvaweb/gvacommon/__init__.py diff --git a/gvacommon/celeryrouters.py b/gvaweb/gvacommon/celeryrouters.py similarity index 100% rename from gvacommon/celeryrouters.py rename to gvaweb/gvacommon/celeryrouters.py diff --git a/gvaweb/__init__.py b/gvaweb/gvaweb/__init__.py similarity index 100% rename from gvaweb/__init__.py rename to gvaweb/gvaweb/__init__.py diff --git a/gvaweb/settings.py b/gvaweb/gvaweb/settings.py similarity index 100% rename from gvaweb/settings.py rename to gvaweb/gvaweb/settings.py diff --git a/gvaweb/webtasks/__init__.py b/gvaweb/gvaweb/webtasks/__init__.py similarity index 100% rename from gvaweb/webtasks/__init__.py rename to gvaweb/gvaweb/webtasks/__init__.py diff --git a/gvaweb/webtasks/tasks.py b/gvaweb/gvaweb/webtasks/tasks.py similarity index 92% rename from gvaweb/webtasks/tasks.py rename to gvaweb/gvaweb/webtasks/tasks.py index 7fc0d06..e36940a 100644 --- a/gvaweb/webtasks/tasks.py +++ b/gvaweb/gvaweb/webtasks/tasks.py @@ -51,11 +51,6 @@ def _build_enabled_vhost_path(sitename): return os.path.join(settings.GVAWEB_NGINX_SITES_ENABLED, sitename) -def _build_php_fpm_pool_file(username): - return os.path.join(settings.GVAWEB_PHPFPM_POOL, "{username}.conf".format( - username=username)) - - def _build_document_root_path(sitename, username): return os.path.join( settings.GVAWEB_WWWUSER_MOUNT, username, sitename, 'html') @@ -195,11 +190,4 @@ def delete_web_php_fpm_pool_config(username): :rtype: boolean """ - try: - subprocess.check_output([ - SUDO_CMD, RM_CMD, "-f", _build_php_fpm_pool_file(username)], - stderr=subprocess.STDOUT) - except subprocess.CalledProcessError as cpe: - log_without_raise( - cpe, 'could not delete PHP FPM configuration for %s', username) return True diff --git a/gvaweb/webtasks/templates/vhost.nginx b/gvaweb/gvaweb/webtasks/templates/vhost.nginx similarity index 100% rename from gvaweb/webtasks/templates/vhost.nginx rename to gvaweb/gvaweb/webtasks/templates/vhost.nginx diff --git a/gvaweb/webtasks/templates/fpmpool.conf b/gvaweb/webtasks/templates/fpmpool.conf deleted file mode 100644 index 66bb4c4..0000000 --- a/gvaweb/webtasks/templates/fpmpool.conf +++ /dev/null @@ -1,15 +0,0 @@ -[{{ user }}] -user = {{ user }} -group = {{ user }} -listen = /var/run/php5-fpm-{{ user }}.sock -listen.owner = www-data -listen.group = www-data -pm = dynamic -pm.max_children = 5 -pm.start_servers = 2 -pm.min_spare_servers = 1 -pm.max_spare_servers = 3 -pm.max_requests = 1000 -chdir = / -request_slowlog_timeout = 10s -slowlog = /var/log/php5-fpm/{{ user }}.slow.log