Исправлена ошибка писка map файла в директориb файла yaml

.gear/nginx-redirector.spec

-%define biname redirector
+%define biname nginx-redirector
 
 Name: nginx-redirector
-Version: 0.1.2
+Version: 0.1.4
 Release: alt1
 
 Summary: CLI-utility for building nginx redirects
@@ -44,15 +44,25 @@ NGINX redirector:
 %python3_install
 mkdir -p %buildroot/var/lib/%biname/location-includes
 mkdir -p %buildroot/var/lib/%biname/maps
+mkdir -p %buildroot/etc/%biname
 
 %files
 /usr/bin/%biname
 /usr/bin/%biname-watch
 /usr/bin/%biname-convert
+
+/var/lib/%biname/location-includes/
+/var/lib/%biname/maps/
+/etc/%biname/
+
+
 %python3_sitelibdir/*
 
 
 %changelog
+* Tue Mar 01 2022 Pablo Soldatoff <soldatoff@etersoft.ru> 0.1.3-alt1
+- new version
+
 * Wed Nov 03 2021 Pablo Soldatoff <soldatoff@etersoft.ru> 0.1.2-alt1
 - new version
 

redirector/tests/nginx/location-includes/test.conf

 if ($test_redirect) {
-	rewrite ^/test/(.*)$ $test_redirect break;
+	rewrite ^/test/(.*)$ $test_redirect redirect;
 }
 if ($test_permanent_redirect) {
 	rewrite ^/test/(.*)$ $test_permanent_redirect permanent;
 }
 if ($test_status=301_redirect) {
-	rewrite ^/test/(.*)$ $test_status=301_redirect break;
+	rewrite ^/test/(.*)$ $test_status=301_redirect redirect;
 return status=301;
 }

redirector/tests/nginx_test_case/location-includes/test.conf

 if ($test_redirect) {
-	rewrite ^/test/(.*)$ $test_redirect break;
+	rewrite ^/test/(.*)$ $test_redirect redirect;
 }
 if ($test_permanent_redirect) {
 	rewrite ^/test/(.*)$ $test_permanent_redirect permanent;
 }
 if ($test_status=301_redirect) {
-	rewrite ^/test/(.*)$ $test_status=301_redirect break;
+	rewrite ^/test/(.*)$ $test_status=301_redirect redirect;
 return status=301;
 }

redirector/utils/const.py

@@ -8,9 +8,9 @@ PYTHON_VERSION = "3.8.1"
 VERSION_STATUS = "alpha"
 
 # directory with maps files
-MAPS_DIR = os.environ.get("MAPS_DIR", "/var/lib/redirector/maps")
+MAPS_DIR = os.environ.get("MAPS_DIR", "/var/lib/nginx-redirector/maps")
 # directory with generated files
-CONFIG_DIR = os.environ.get("CONFIG_DIR", "/var/lib/redirector/location-includes")
+CONFIG_DIR = os.environ.get("CONFIG_DIR", "/var/lib/nginx-redirector/location-includes")
 # main yaml-config
-CONFIG = os.environ.get("CONFIG", "/etc/redirector/config.yaml")
+CONFIG = os.environ.get("CONFIG", "/etc/nginx-redirector/config.yaml")
 

redirector/utils/parser.py

@@ -116,11 +116,12 @@ class ConfigReader:
 
         # normalize path     
         yaml_dir = os.path.dirname(os.path.abspath(yaml_file)) # get yaml file directory for restore rel path to map file
+        map_dir = os.path.dirname(os.path.abspath(map_file))
         map_file_name = os.path.basename(map_file) # get filename from arg
 
         try:
             for map_path, prefix in self.parse_yaml(yaml_file):
-                abs_map_path = get_map_path(map_path, yaml_dir)
+                abs_map_path = get_map_path(map_path, map_dir)
 
                 if map_file_name not in abs_map_path:
                     continue

setup.py

@@ -30,9 +30,9 @@ setup(
     packages=['redirector', 'redirector.utils', 'redirector.tests'],
     entry_points={
         'console_scripts': [
-            'redirector = redirector.redirector:main',
-            'redirector-watch = redirector.watcher:watch',
-            'redirector-convert = redirector.htaccess_parser:main'
+            'nginx-redirector = redirector.redirector:main',
+            'nginx-redirector-watch = redirector.watcher:watch',
+            'nginx-redirector-convert = redirector.htaccess_parser:main'
         ]
     },
     classifiers=classifiers_list,