From 7256d9a4a92370d4641f1313cd9a091ff277c25b Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Tue, 22 Dec 2020 18:45:12 +0100 Subject: [PATCH 1/4] remove ldap packages installation via apt: not needed anymore --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4bec259..2edd58a 100644 --- a/Makefile +++ b/Makefile @@ -18,14 +18,13 @@ check-poetry: install-poetry: ## install or update poetry pip3 install -U poetry -install: check-poetry ## install PyInventory via poetry - sudo apt install python3-ldap libldap2-dev libsasl2-dev +install: check-poetry ## install project via poetry poetry install update: install-poetry ## update the sources and installation poetry update -local-test: check-poetry ## Run local_test.py to run pyinventory_ynh locally +local-test: check-poetry ## Run local_test.py to run the project locally poetry run ./local_test.py local-diff-settings: ## Run "manage.py diffsettings" with local test From a8fc11e0c9937e12f42acb7843fd3ef6cb2ec79b Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Tue, 22 Dec 2020 18:45:38 +0100 Subject: [PATCH 2/4] remove "django_auth_ldap" from logging: it's obsolete --- conf/ynh_pyinventory_settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/ynh_pyinventory_settings.py b/conf/ynh_pyinventory_settings.py index 8155b60..5127053 100644 --- a/conf/ynh_pyinventory_settings.py +++ b/conf/ynh_pyinventory_settings.py @@ -170,7 +170,6 @@ LOGGING = { 'django': {'handlers': ['log_file', 'mail_admins'], 'level': 'INFO', 'propagate': False}, 'axes': {'handlers': ['log_file', 'mail_admins'], 'level': 'WARNING', 'propagate': False}, 'django_tools': {'handlers': ['log_file', 'mail_admins'], 'level': 'INFO', 'propagate': False}, - 'django_auth_ldap': {'handlers': ['log_file', 'mail_admins'], 'level': 'DEBUG', 'propagate': False}, 'inventory': {'handlers': ['log_file', 'mail_admins'], 'level': 'INFO', 'propagate': False}, }, } From f52c90c7ecba40d40bc50c0c8809e97086b9f6a3 Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Wed, 23 Dec 2020 08:52:02 +0100 Subject: [PATCH 3/4] Fix restore by calling chown for log file --- scripts/restore | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/restore b/scripts/restore index 3145133..b0f4dad 100755 --- a/scripts/restore +++ b/scripts/restore @@ -70,6 +70,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" --use_shell #================================================= # Restore permissions on app files +chown -R "$app" "$log_path" chown -R "$app" "$public_path" chown -R "$app" "$final_path" From 3e3eecd184a0748a89544f7560af2b6f7e9ecdb5 Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Wed, 23 Dec 2020 08:54:13 +0100 Subject: [PATCH 4/4] release as 0.8.2~ynh4 --- manifest.json | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 71dec8c..167d761 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Web based management to catalog things including state and location etc." }, - "version": "0.8.2~ynh3", + "version": "0.8.2~ynh4", "url": "https://github.com/jedie/PyInventory", "license": "GPL-3.0", "maintainer": { diff --git a/pyproject.toml b/pyproject.toml index bb31e9b..026a1d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyinventory_ynh" -version = "0.8.2~ynh3" +version = "0.8.2~ynh4" description = "Test pyinventory_ynh via local_test.py" authors = ["JensDiemer "] license = "GPL"