Commit 24a459b0 authored by Vitaly Lipatov's avatar Vitaly Lipatov

0.2.0-alt1

- use envs instead of config.ini - use constants instead of config.ini - update README.md - [fix] Fix prefix writing in project redirects - fix map file search - fix generated map file - fix nginx-redirector-watch - add systemd unit file - make python 3.5 compatible - return check section (disabled for now)
parent 01bf4663
# TODO:
%def_without test
%define biname nginx-redirector %define biname nginx-redirector
Name: nginx-redirector Name: nginx-redirector
Version: 0.1.8 Version: 0.2.0
Release: alt1 Release: alt1
Summary: CLI-utility for building nginx redirects Summary: CLI-utility for building nginx redirects
...@@ -10,26 +12,25 @@ License: ISC ...@@ -10,26 +12,25 @@ License: ISC
Group: Networking/WWW Group: Networking/WWW
Url: https://gitlab.eterfund.ru/eterfund/nginx-redirector Url: https://gitlab.eterfund.ru/eterfund/nginx-redirector
Packager: Eugene Omelyanovich <regatio@etersoft.ru>
# Source-git: https://gitlab.eterfund.ru/eterfund/nginx-redirector.git # Source-git: https://gitlab.eterfund.ru/eterfund/nginx-redirector.git
Source: %name-%version.tar Source: %name-%version.tar
BuildRequires(pre): rpm-build-intro BuildRequires(pre): rpm-build-intro
BuildRequires(pre): rpm-build-python3 BuildRequires(pre): rpm-build-python3
# for test %if_with test
BuildRequires: python3-module-pyinotify BuildRequires: python3-module-pyinotify
BuildRequires: python3-module-setuptools BuildRequires: python3-module-setuptools
BuildRequires: python3-module-yaml BuildRequires: python3-module-yaml
%endif
BuildArch: noarch BuildArch: noarch
%description %description
NGINX redirector: NGINX redirector:
* nginx-redirector <.yaml file> <.map file> - generate .conf and .map files for redirects for nginx * %biname <.yaml file> <.map file> - generate .conf and .map files for redirects for nginx
* nginx-redirector-watch <file-to-watch> - set inotify watchdog for this file and renew .map and .conf files for this project when * %biname-watch <file-to-watch> - set inotify watchdog for this file and renew .map and .conf files for this project when
* nginx-redirector-convert <.htaccess file> <.map file> - convert .htaccess to .map file * %biname-convert <.htaccess file> <.map file> - convert .htaccess to .map file
* nginx-redirector-config --show - show all current config.ini data
%prep %prep
%setup %setup
...@@ -39,6 +40,7 @@ NGINX redirector: ...@@ -39,6 +40,7 @@ NGINX redirector:
%install %install
%python3_install %python3_install
%python3_prune
mkdir -p %buildroot/var/lib/%biname/location-includes mkdir -p %buildroot/var/lib/%biname/location-includes
mkdir -p %buildroot/var/lib/%biname/maps mkdir -p %buildroot/var/lib/%biname/maps
mkdir -p %buildroot/etc/%biname mkdir -p %buildroot/etc/%biname
...@@ -47,22 +49,35 @@ mkdir -p %buildroot/var/log/%biname ...@@ -47,22 +49,35 @@ mkdir -p %buildroot/var/log/%biname
#cp nginx-redirector-watch.service %buildroot/etc/systemd/system/nginx-redirector-watch.service #cp nginx-redirector-watch.service %buildroot/etc/systemd/system/nginx-redirector-watch.service
install -pD -m644 nginx-redirector.service %buildroot%systemd_unitdir/nginx-redirector.service install -pD -m644 nginx-redirector.service %buildroot%systemd_unitdir/nginx-redirector.service
%check
%python3_test
%files %files
/usr/bin/%biname /usr/bin/%biname
/usr/bin/%biname-watch /usr/bin/%biname-watch
/usr/bin/%biname-convert /usr/bin/%biname-convert
%python3_sitelibdir/*
/etc/%biname/
%systemd_unitdir/*
/var/lib/%biname/location-includes/ /var/lib/%biname/location-includes/
/var/lib/%biname/maps/ /var/lib/%biname/maps/
/var/log/%biname /var/log/%biname
/etc/%biname/
%systemd_unitdir/*
%python3_sitelibdir/*
%changelog %changelog
* Tue Mar 29 2022 Vitaly Lipatov <lav@altlinux.ru> 0.2.0-alt1
- use envs instead of config.ini
- use constants instead of config.ini
- update README.md
- [fix] Fix prefix writing in project redirects
- fix map file search
- fix generated map file
- fix nginx-redirector-watch
- add systemd unit file
- make python 3.5 compatible
- return check section (disabled for now)
* Tue Mar 01 2022 Pablo Soldatoff <soldatoff@etersoft.ru> 0.1.3-alt1 * Tue Mar 01 2022 Pablo Soldatoff <soldatoff@etersoft.ru> 0.1.3-alt1
- new version - new version
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment