From 51352a6819439ecf846022ebd770fac56df72bde Mon Sep 17 00:00:00 2001 From: R4SAS Date: Sat, 10 Nov 2018 03:25:51 +0000 Subject: [PATCH] update debian/rpm tunnels.d storing + testing rpm changes: manpage and configs store --- contrib/rpm/i2pd-git.spec | 32 ++++++++++++++++---------------- contrib/tunnels.d/IRC-Irc2P.conf | 2 +- contrib/tunnels.d/README | 5 ++++- debian/docs | 1 + debian/i2pd.dirs | 1 - debian/i2pd.install | 2 +- debian/i2pd.links | 2 +- 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/contrib/rpm/i2pd-git.spec b/contrib/rpm/i2pd-git.spec index 984ccffa..9d068c11 100644 --- a/contrib/rpm/i2pd-git.spec +++ b/contrib/rpm/i2pd-git.spec @@ -56,18 +56,18 @@ make %{?_smp_mflags} %install cd build chrpath -d i2pd -install -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd -install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}%{_sysconfdir}/i2pd/i2pd.conf -install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf -install -d -m 755 %{buildroot}%{_datadir}/i2pd -install -d -m 755 %{buildroot}%{_datadir}/i2pd/tunnels.conf.d -%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates -%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/tunnels.d/ %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d -install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}%{_unitdir}/i2pd.service -install -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd -install -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd +%{__install} -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd +%{__install} -D -m 755 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}%{_sysconfdir}/i2pd/i2pd.conf +%{__install} -D -m 755 %{_builddir}/%{name}-%{version}/contrib/subscriptions.txt %{buildroot}%{_sysconfdir}/i2pd/subscriptions.txt +%{__install} -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf +%{__install} -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.d/README %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d/README +%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}%{_unitdir}/i2pd.service +%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/debian/i2pd.1 %{buildroot}%{_mandir}/man1/i2pd.1 +%{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd +%{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd +%{__install} -d -m 755 %{buildroot}%{_datadir}/%{name} +%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/%{name}/certificates ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates -ln -s %{_datadir}/i2pd/tunnels.conf.d %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d %pre @@ -90,14 +90,14 @@ getent passwd i2pd >/dev/null || \ %files -%doc LICENSE README.md +%doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d %{_sbindir}/i2pd -%{_datadir}/i2pd/certificates %config(noreplace) %{_sysconfdir}/i2pd/* -%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/* -/%{_unitdir}/i2pd.service -%dir %attr(0700,i2pd,i2pd) %{_localstatedir}/log/i2pd +%{_unitdir}/i2pd.service +%{_mandir}/man1/i2pd.1* %dir %attr(0700,i2pd,i2pd) %{_sharedstatedir}/i2pd +%dir %attr(0700,i2pd,i2pd) %{_localstatedir}/log/i2pd +%{_datadir}/%{name}/certificates %{_sharedstatedir}/i2pd/certificates diff --git a/contrib/tunnels.d/IRC-Irc2P.conf b/contrib/tunnels.d/IRC-Irc2P.conf index 7255f9d5..97da71dc 100644 --- a/contrib/tunnels.d/IRC-Irc2P.conf +++ b/contrib/tunnels.d/IRC-Irc2P.conf @@ -4,4 +4,4 @@ #port = 6668 #destination = irc.postman.i2p #destinationport = 6667 -#keys = irc-keys.dat \ No newline at end of file +#keys = irc-keys.dat diff --git a/contrib/tunnels.d/README b/contrib/tunnels.d/README index 3ac3c1a3..7b07c4be 100644 --- a/contrib/tunnels.d/README +++ b/contrib/tunnels.d/README @@ -1 +1,4 @@ -In that directory you can store separated config files for every tunnel. \ No newline at end of file +# In that directory you can store separated config files for every tunnel. +# Please read documentation for more info. +# +# You can find examples in /usr/share/doc/i2pd/tunnels.d directory diff --git a/debian/docs b/debian/docs index b67deb18..dfa6f572 100644 --- a/debian/docs +++ b/debian/docs @@ -2,3 +2,4 @@ README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf +contrib/tunnels.d diff --git a/debian/i2pd.dirs b/debian/i2pd.dirs index 736e23bd..3b643352 100644 --- a/debian/i2pd.dirs +++ b/debian/i2pd.dirs @@ -1,3 +1,2 @@ etc/i2pd -etc/i2pd/tunnels.conf.d var/lib/i2pd diff --git a/debian/i2pd.install b/debian/i2pd.install index cae69c0e..d20b2c17 100644 --- a/debian/i2pd.install +++ b/debian/i2pd.install @@ -3,5 +3,5 @@ contrib/i2pd.conf etc/i2pd/ contrib/tunnels.conf etc/i2pd/ contrib/subscriptions.txt etc/i2pd/ contrib/certificates/ usr/share/i2pd/ -contrib/tunnels.d/ etc/i2pd/tunnels.conf.d +contrib/tunnels.d/README etc/i2pd/tunnels.conf.d/ contrib/apparmor/usr.sbin.i2pd etc/apparmor.d diff --git a/debian/i2pd.links b/debian/i2pd.links index 083bc6ca..a149967f 100644 --- a/debian/i2pd.links +++ b/debian/i2pd.links @@ -1,5 +1,5 @@ etc/i2pd/i2pd.conf var/lib/i2pd/i2pd.conf etc/i2pd/tunnels.conf var/lib/i2pd/tunnels.conf etc/i2pd/subscriptions.txt var/lib/i2pd/subscriptions.txt -etc/i2pd/tunnels.conf.d var/lib/i2pd/tunnels.conf.d +etc/i2pd/tunnels.conf.d var/lib/i2pd/tunnels.d usr/share/i2pd/certificates var/lib/i2pd/certificates