Merge branch 'openssl' of https://github.com/PurpleI2P/i2pd into openssl

contrib/rpm/i2pd-git.spec

@@ -75,7 +75,6 @@ pushd build
 chrpath -d i2pd
 %{__install} -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd
 %{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd
-%{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd/tunnels.conf.d
 %{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
 %{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
 %{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}%{_sysconfdir}/i2pd/i2pd.conf
@@ -112,6 +111,7 @@ getent passwd i2pd >/dev/null || \
 %doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d
 %{_sbindir}/i2pd
 %config(noreplace) %{_sysconfdir}/i2pd/*.conf
+%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*.conf
 %config %{_sysconfdir}/i2pd/subscriptions.txt
 %doc %{_sysconfdir}/i2pd/tunnels.conf.d/README
 %{_sysconfdir}/logrotate.d/i2pd

contrib/rpm/i2pd.spec

@@ -73,7 +73,6 @@ pushd build
 chrpath -d i2pd
 %{__install} -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd
 %{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd
-%{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd/tunnels.conf.d
 %{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
 %{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
 %{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}%{_sysconfdir}/i2pd/i2pd.conf
@@ -110,6 +109,7 @@ getent passwd i2pd >/dev/null || \
 %doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d
 %{_sbindir}/i2pd
 %config(noreplace) %{_sysconfdir}/i2pd/*.conf
+%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*.conf
 %config %{_sysconfdir}/i2pd/subscriptions.txt
 %doc %{_sysconfdir}/i2pd/tunnels.conf.d/README
 %{_sysconfdir}/logrotate.d/i2pd