Compare commits

22 Commits

Author SHA1 Message Date
2161cac791 Fix makefile typo 2025-12-31 16:48:37 +01:00
41afd81c9b Add missing directory on install 2025-12-31 16:47:49 +01:00
51d17d5f25 Fix typo 2025-12-31 16:45:30 +01:00
8c6f87c3b8 Fix Makefile typo 2025-12-31 16:42:54 +01:00
bfc50470cd Fix makefile fuction 2025-12-31 16:37:13 +01:00
abc10cd4b8 Fix makefile function typo 2025-12-31 16:34:15 +01:00
d65e94be20 Fix makefile variables 2025-12-31 16:32:04 +01:00
4dbfdb8d4e Refacto to replace nginx with netoik-rp 2025-12-31 16:27:04 +01:00
dac79d5711 Unset %config attribute for nginx.conf 2025-12-31 14:22:06 +01:00
17cc666f54 Replace crontab file with a printf 2025-12-31 14:02:22 +01:00
ecf165ea2e Use env command 2025-12-30 16:09:50 +01:00
fb461744ea Add crontab file 2025-12-30 16:09:36 +01:00
e0df6262cd Add crontab 2025-12-30 16:08:30 +01:00
092d7e3104 Add nginx config in make install 2025-12-30 15:35:24 +01:00
6285e43118 Add nginx config file 2025-12-30 15:30:58 +01:00
54cd95dda9 Remove ovh.ini from %files 2025-12-30 14:28:52 +01:00
5eb4902ee6 Write %post section 2025-12-30 14:21:19 +01:00
896e0580a2 Move config files in etc 2025-12-30 14:20:54 +01:00
b6217ef663 Add autochangelog 2025-12-28 13:08:08 +01:00
66abb3bda3 Define debug_package to nil 2025-12-28 13:02:18 +01:00
6fa31ff7c0 Create /etc/nginx directory in make install 2025-12-28 11:53:14 +01:00
54e1b51494 Use make name command 2025-12-28 11:52:46 +01:00
6 changed files with 62 additions and 14 deletions

1
.gitignore vendored
View File

@@ -1 +1,2 @@
*.swp *.swp
*.env

View File

@@ -4,6 +4,8 @@ BRANCH = $(shell git branch --show-current)
RPM_SOURCEDIR = $(shell rpm --eval '%{_sourcedir}') RPM_SOURCEDIR = $(shell rpm --eval '%{_sourcedir}')
RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}') RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}')
RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}')
RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
.PHONY: name .PHONY: name
name: name:
@@ -13,7 +15,7 @@ name:
version: version:
@echo "$(VERSION)" @echo "$(VERSION)"
$(RPM_SOURCEDIR)/$(NAME)-%.tar.gz: * $(RPM_TARBALL_PATH): *
git archive --format=tar.gz \ git archive --format=tar.gz \
--output="$@" \ --output="$@" \
--prefix="$(NAME)-$(VERSION)/" \ --prefix="$(NAME)-$(VERSION)/" \
@@ -21,8 +23,12 @@ $(RPM_SOURCEDIR)/$(NAME)-%.tar.gz: *
"$(BRANCH)" "$(BRANCH)"
.PHONY: tarball .PHONY: tarball
tarball: $(RPM_SOURCEDIR)/$(NAME)-$(VERSION).tar.gz tarball: $(RPM_TARBALL_PATH)
.PHONY: install .PHONY: install
install: install:
install -m 644 --target-directory=$(DESTDIR)/$(RPM_SYSCONFDIR)/nginx nginx.conf install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/netoik-rp
install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/netoik-rp/ conf/netoik-rp.conf
install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/netoik-rp/ conf/ovh.ini
install --directory $(DESTDIR)$(RPM_UNITDIR)
install --target-directory=$(DESTDIR)$(RPM_UNITDIR)/ services/netoik-rp.service

6
conf/ovh.ini Normal file
View File

@@ -0,0 +1,6 @@
# OVH API credentials used by Certbot
# Name referenced in OVH: rasp.netoik.io
dns_ovh_endpoint = $DNS_OVH_ENDPOINT
dns_ovh_application_key = $DNS_OVH_APPLICATION_KEY
dns_ovh_application_secret = $DNS_OVH_APPLICATION_SECRET
dns_ovh_consumer_key = $DNS_OVH_CONSUMER_KEY

View File

@@ -1,16 +1,16 @@
Name: netoik-rp %define debug_package %{nil}
Version: %(make version)
Release: 1%{?dist}
Summary: Netoik Reverse Proxy
License: MIT
Name: %(make name)
Version: %(make version)
Release: 1%{?dist}
Summary: Netoik Reverse Proxy
License: MIT
URL: https://git.netoik.io/samuel/netoik-rp URL: https://git.netoik.io/samuel/netoik-rp
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Buildarch: noarch
Buildarch: x86_64
BuildRequires: make BuildRequires: make
Requires: nginx,python3,python-devel,augeas-devel,gcc
Requires: nginx
%description %description
Install the reverse proxy called nginx with a predefined configuration and with TLS certificates attached to netoik.io Install the reverse proxy called nginx with a predefined configuration and with TLS certificates attached to netoik.io
@@ -21,8 +21,29 @@ Install the reverse proxy called nginx with a predefined configuration and with
%install %install
%make_install %make_install
%post
if [ $1 == 1 ]; then
# Replace secrets in ovh.ini
%{_bindir}/env envsubst < %{_sysconfdir}/%{name}/ovh.ini > %{_sysconfdir}/%{name}/ovh.ini.tmp
%{_bindir}/env mv %{_sysconfdir}/%{name}/ovh.ini.tmp %{_sysconfdir}/%{name}/ovh.ini
# Create virutal env with certbot cli
%{_bindir}/env python3 -m venv /opt/certbot
/opt/certbot/bin/pip install --upgrade pip certbot certbot-dns-ovh
%{_bindir}/env ln --symbolic --target-directory %{_sbindir} /opt/certbot/bin/certbot
%{_bindir}/env certbot certonly --dns-ovh --dns-ovh-credentials "%{_sysconfdir}/%{name}/ovh.ini" -d "*.netoik.io" -d "*.samuel-campos.fr"
%{_bindir}/env printf "\nAutomatic certbot renew\n0 12 * * * root sleep $((RANDOM % 3600)) && certbot renew -q\n" >> %{_sysconfdir}/crontab
fi
%{_bindir}/env systemctl disable nginx
%{_bindir}/env systemctl stop nginx
%{_bindir}/env systemctl enable %{name}
%{_bindir}/env systemctl start %{name}
%files %files
%attr(644, root, root) /%{_sysconfdir}/nginx/nginx.conf %attr(755, root, root) %dir %{_sysconfdir}/%{name}
%attr(600, root, root) %config %{_sysconfdir}/%{name}/ovh.ini
%attr(644, root, root) %config %{_sysconfdir}/%{name}/netoik-rp.conf
%attr(644, root, root) %config %{_unitdir}/%{name}.service
%changelog %changelog
# let's skip this for now %autochangelog

View File

@@ -0,0 +1,14 @@
[Service]
Type=forking
PIDFile=/run/netoik-rp.pid
ExecStartPre=/usr/bin/env rm -f /run/netoik-rp.pid
ExecStartPre=/usr/bin/env nginx -t -c /etc/netoik-rp/netoik-rp.conf
ExecStart=/usr/bin/env nginx -c /etc/netoik-rp/netoik-rp.conf
ExecReload=/usr/bin/env nginx -s reload -c /etc/netoik-rp/netoik-rp.conf
KillSignal=SIGQUIT
TimeoutStopSec=5
KillMode=mixed
PrivateTmp=true
[Install]
WantedBy=multi-user.target