Improve service handling

Package-Manager: portage-2.2.14
Manifest-Sign-Key: 0xA5C1A1D24B128E52

6 files changed, 29 insertions, 30 deletions

diff --git a/net-misc/i2pd/ChangeLog b/net-misc/i2pd/ChangeLog
index 8b2713c..a5b508b 100644
--- a/net-misc/i2pd/ChangeLog
+++ b/net-misc/i2pd/ChangeLog
@@ -1,6 +1,10 @@
   30 Dec 2014; Francisco Blas Izquierdo Riera (klondike) files/i2pd.initd:
   Fix the init.d
 
+  30 Dec 2014; Francisco Blas Izquierdo Riera (klondike) files/i2pd.1,
+  files/i2pd.conf, files/i2pd.service:
+  Improve service handling
+
   29 Dec 2014; Francisco Blas Izquierdo Riera (klondike) i2pd-0.5.0.ebuild:
   Another artifact from multilib tests install_all should be install
 
diff --git a/net-misc/i2pd/Manifest b/net-misc/i2pd/Manifest
index 6c7aeca..86dac16 100644
--- a/net-misc/i2pd/Manifest
+++ b/net-misc/i2pd/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 AUX 99i2pd 44 SHA256 ecc85329d663182165bf6b5f672237a9f4f129f39f168d38c876345f3b83d765 SHA512 0bd08ff5b1b2ad8d91572efee848a760e2fb46d9c1a5ead3fbdde91d679d832d985905952b393eb523ec9d8f1815bf1512ae61fbc059d10f0773991ac097c23f WHIRLPOOL 08404eab764fa25ae0f5cbda5fa38deabcae913baf3e0d4e151ae34a0fb3383994d0ab4db15e60827a3fc18ebaf4e4f541163cc3825b3baf3c75533a08d4c94e
-AUX i2pd.1 3568 SHA256 713a40b5fe6c6fb40a7c1ee4e7cc4e7c5cdd9cde88a01651357c6b744168983d SHA512 523d2823c0ddec83ed650cc4c61e4965c3985d7399c73679e68d27c675924715bf86c22a3335ac97e963095c1db9c199da3a74ddbddc3110289561194e06d109 WHIRLPOOL d9b2ab16cf8da0330f0b88740496a5c2f5221f83daeabf493faafa6b4d010bff01da160547e7b3e513c88a1642e98531858f0a5aa2a357c25f680ec0b779fce9
-AUX i2pd.conf 32 SHA256 723d883dbdc9cdad64d58db65d29f48f63b9402d9af6ce81bc2c17cd0e250e02 SHA512 426c141445a84dcadf38f0321c68e0c851b9f01cc40858a217ef5e8202fee446f250dbeeeeef22a48086628ee8b4f8ea7683b3f936ce70fa6c28d29eee4271f8 WHIRLPOOL f5596d54105052b996bc0fc93937f92ff7eb52b3c8290c1eae51a45b54a453cc6b83acc49dfaeab30947807bcbb312ee1fd4a8ed1b38a11402a2e54a8ffd4075
+AUX i2pd.1 3414 SHA256 973ef9ada67ab875172e3d7f7ab1349dc26d9a4cad8505ce6894988eba88e596 SHA512 d13c971d4aefa17cd260923143e7753d40e1fb87dd3b298785381110838af03041ff9ad58e966521801871c7cf9c6715265bc9e8cce88302b7d5bcdc584bf1e5 WHIRLPOOL b5f96fdc19f49d210f7f6aff74354cd822f6b3e0a7d1ed45da3918d6b844f52462589a400ce881f52eed5fa6cb5ae6c0300495b8e5eb9eb7100801ddc6e5f174
+AUX i2pd.conf 32 SHA256 1db231f628f1e494f4de8e8bec86e2ab5c7ce92f15626c2bfd2682595d381e54 SHA512 acddc5593c329e2da93d7845bfc564c745e8ca842ea39564408a245ca4c78f1b83aeaa4abeb4179aef1003819c1a95782aed4709e26137c953d90bd49b2157f6 WHIRLPOOL e94d30c8fe8bdcb0836a84583ba3969575ad65d09cf0c025b969c299fdf6b6d56caba90880ab9fe6f1eeaffa27189271409e85e5ae8ecfd0357c95e0eec9bec1
 AUX i2pd.confd 176 SHA256 9021447caafd6193a5a87b12d815facf8608d37e0af3e6ff934975f255811385 SHA512 706be4b5c7c1f14222129ec079294fa99c8ee024fede18a64d6d117bf7982e1bc87b19544bf46ff139caad18dc4d592275f7f73171be5abd140909a72c0a14ed WHIRLPOOL c71d2055a64bceb9f4e31415e306e14453f5780874744142025c5c97bb3519c06bd50fcd3ef2b839932cedf313dcd171fe8c77d2d55ee46c74ee247b02e69235
-AUX i2pd.initd 629 SHA256 581e5d914ba16d542af7019de0c6a4556521de7525f5821357fac7a59767774f SHA512 3332e0357cd68fb72d21f66c24ef0bf888b349ab898992a85fa78e389857da2f94df8e950fb5e23ff43546aeb06ab34dd725f9507d2e34808821c215b707f944 WHIRLPOOL 35c12a12ef50b387e3bda5969ba51c0dc8cc7e225b139154f90cc69f5ed9dd1580d03bc273df54ddac7ddb6910ef28cd4606eae1da3b19a81475d5fa8db8a6dd
+AUX i2pd.initd 612 SHA256 a424b1f4f2e1beed23f8d7fb191eed71998e5a09156079cd569ff1378e01c9af SHA512 0ffd4c9594682d0459732379c46c06bb19fe16510512f7c707938020bf871531e5d063dfa3c62a1700d645c002b9b44f5d7935358c8c2d1215eddb1e974bcfa2 WHIRLPOOL b9071fdc7069350b4e45c4e4449f3885cd38b05847e30feb2e3750c8b59062e2023a53b51f3b6a45ec217ae040ec7a4b4784bbd9bd6be15e3e714aaf96db030e
 AUX i2pd.logrotate 270 SHA256 cac89d98a0c2eff2eeedb323b3b81c3e316293f80d3397bfeb833f700e98b691 SHA512 08a944576f3f103ef7206e5e09ad7256f79254097d389b955271db9a8e3781332d9ac564cef06a7bb6c3837324abee3035cb18588470f43861310e886c4f7075 WHIRLPOOL 79096ea93a446240d84bc65930e0746f8fae203303d9309a1a345a1818c11525d782f51dd7200f55d5f1c79b79a7d43c9d1a510225aa5bdf522baf4884a45700
-AUX i2pd.service 399 SHA256 6fa9a8a00e9831c824cf049ebc245ec65510d19fa65e7f8a352f88b0433115d4 SHA512 353e33254ba2d7bc8b6ebc5551ee1bb81ccbce97667018c5b6341df154d1d734cad09a2a1e0bc8b05132020aca92e98783e6719176d1306e1984bd86a4d45f65 WHIRLPOOL fd0bb4b15449d1a892c62a4aa1015cec4ee8c8af38e2b263e654200938af15128b444ee2a79ff2fc6ba83801d21385a09b779dc45d53e9060f4aff250f6e760a
+AUX i2pd.service 412 SHA256 afc2b4a72e3bec2c45a838971375a1e8a438bc9cb09a082f138583e226ee8402 SHA512 99ec3dbe7c983d732c483207f49a9b9456c83c17b76605f663fb177142e09e11e0e3fe4e10ffaaca3b9e08519a055ab5efee4117b6e977d22ec80c6aa7c3d3eb WHIRLPOOL dc47e828a8a457e16e16ff5dae50c73fdeaa6a79d36d2f2d4e44919e06e222a2b14d0677c77ef2d471107d8ce669ad499172656f3985bee18697f2725df2e95e
 DIST i2pd-0.5.0.tar.gz 352460 SHA256 7f2033fe1c380c458722d68f611d0fa69a844ceba71db13a918adac6e01a0594 SHA512 08c51dc5fa3712af54b7dcc9f4524fb19d7b42a279646c7852efdf1fd49cf4ea24192c936229954c3733ba4bcbc480205bcfeca739ffae3642f5c62bd24e0cf6 WHIRLPOOL 1812a8733f17cd6b9885cf8af3ad0412f238356121118d46fbed53cb826aaa6c878a045adb69e0a692fd5cd3fc720192c635f4e594d3d42efb2116f14bbba9e9
 EBUILD i2pd-0.5.0.ebuild 1845 SHA256 d359c5eae64a9421cb831938eee3d4d8a484cd872169b40c0b93bda40b7b2420 SHA512 f2844531b16a4be3609bda365326354d3ecae205434bffe4eaa2e5b4177f723e97be2ae1d222bb9a28d6e40c015dea09071bccc7b2a7faa9ceb23009b32b6cdb WHIRLPOOL e1d8c5c591479d80f5912a7d5bf0e17b1b0f0323260506862a03000d345aaded6bc9172e5cecdc24a9a3804316175a81665f1a18724431ca4c6074d7ae2a900f
 EBUILD i2pd-9999.ebuild 1875 SHA256 2e34270722cfb8501c282c89d14987a1857cc6adb70f50c884b988e5cbbe9fd3 SHA512 18877c292889d5d614fdd310a243e0e574fe98f124ac29411a716a634318b2a25770505635444994c6903d1303c1b24625463c860ed4c2afaf3cf085b25f7d38 WHIRLPOOL 283361622bfee68c94b832bae9c43d5e86f146fc6031c9620da6c55ebcc36a789bf0c3329f6cdd69abe418b56259f2f6eccf48dd8f8fb3463020ca71071b9ede
-MISC ChangeLog 826 SHA256 fea9d4148cb6f733682874d81047b6a73e848b58670c579583a09aac69339c08 SHA512 682a7c498ab71757de62ebe5d1c93c1202c951d6b61f09ef231b1b24401b08c0ef016ab768913e2a7c113121880e45a85925c2ca86621bbe211757b8001df214 WHIRLPOOL 0012a627e3e33243ac2a98443dc969dab47cb7cdf29c4767069c9332a9790b41982507c1d10fee9e598ad30ed7bf0f4c566d8bbdfa6fa1ecdd56427378a47c74
+MISC ChangeLog 964 SHA256 3bca0c8b425880c2da8a1111758eec9671ca91d9a6e4bfe816a6bec8dbe2e613 SHA512 e8a7b791db1784c361a2298ba10add1c8697d22b504e35e12d8981ca8c19d8f5a48264b6d3bbe2872ee91e53cabcd26ca4121736b6c5957feea2190b75bddc7e WHIRLPOOL 469a878b60bf3426a37801982d73e58076ca9a903b8896553d17a70d44e171649efdd1ba60836dba02f254051059ba20b47ace9824005c3398d8c63c7de15438
 MISC metadata.xml 505 SHA256 94805fb4a94ff250fb81c585d9088f9575b6cef36b717bee72a566fe7a9d13aa SHA512 c4ff8b6c0535316934c77fd3c5249481a4c2a619a4f743b7f7784ff25e1b2839690239581c1d92b4176d4369c4f6a5a488f206c3ed6cc0433843e08b1f2c20f5 WHIRLPOOL 8231dfd31bdbc80c375f3efc8f190c10bd208c553e070ae3181bcf3d7e0760b540877a90f347080c43984c6a6a3815e91f5e211972058b444869b43b82c7e710
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUofDcAAoJEKXBodJLEo5SqDgH/iHPmtlx6wBCkE75GVvMV74h
-b9aNNCxQu5IabMQGfZNDyraDEN2dN1QTRfVxkWexu0QRwDAriavuwWd80r8iyu7O
-MrrFPz7lt+ghSV/qShANKI9raNgyguj1Sk7T5FafBYEwGBY5CZguQxexvwzhJOIa
-p7X/eu5RrJZhrwg/3CZxleJL+1qL5pGDIXeHsVsU1z202TuSLrwhO1oUteAwPU68
-mgoxkHkQ+jcjSH477HrkpY5PmqPj4th9iZVi4FtmBopmB1MIt5cUNpWtal0Drutr
-w1Os2hpUZLfBB5BIYxjrWTDx3FzyHHw1tE8AUENl8dHMmaGneUprZM8GkFMad0Y=
-=kLAB
+iQEcBAEBCAAGBQJUotFQAAoJEKXBodJLEo5SEYAH/jXCwjAIH7utVG4dWJplNIt9
+aVKLS7yQ3MC8Csk4qxjsyLhfUP6cafppjaZUOniSBOliXzhbHQclXLYxKPChz+xy
+y4rgMXwzh2c7IZRrlweLgyht1e3jpfHuB7p2N/6xlWRJtoeGzVyNbGkW6hzROlid
+vxQ9UKb6qHB1rqgz9AiPrlgMp0OVPAKCi4TUpPM2A5q7vB497nk9hlIK1IcyaG7a
+Iki9IPSnQfDVnXfoYJ/mNUbn/FJ3fBasoh6h+BvFcED9xOOE+rqtXslweTR4QCmV
+JzWAy3tMqqUMc9z4En+zS9NGISZCX5IOwb4u53uKOvjL0CHnGV6pCZmuN76zAxI=
+=BxHf
 -----END PGP SIGNATURE-----
diff --git a/net-misc/i2pd/files/i2pd.1 b/net-misc/i2pd/files/i2pd.1
index dd08fb4..4dc6958 100644
--- a/net-misc/i2pd/files/i2pd.1
+++ b/net-misc/i2pd/files/i2pd.1
@@ -15,7 +15,7 @@ communicate. All data is wrapped with several layers of encryption, and the
 network is both distributed and dynamic, with no trusted parties.
 
 .PP
-Any of the configuration options below can be used in the \fBDAEMON_ARGS\fR variable in \fI/etc/default/i2pd\fR.
+Any of the configuration options below can be used in the \fI2PDOPTIONS\fR variable in \fI/etc/conf.d/i2pd\fR.
 .BR
 .TP
 \fB\-\-host=\fR
@@ -72,18 +72,17 @@ Port of SAM bridge. Usually \fI7656\fR. SAM will not be enabled if this is not s
 .TP
 \fB\-\-bobport=\fR
 Port of BOB command channel. Usually \fI2827\fR. BOB will not be enabled if this is not set. (default: unset)
-.TP
-\fB\-\-conf=\fR
-Config file (default: \fI~/.i2pd/i2p.conf\fR or \fI/var/lib/i2pd/i2p.conf\fR)
-This parameter will be silently ignored if the specified config file does not exist.
-Options specified on the command line take precedence over those in the config file.
 
 .SH FILES
 .PP
-/etc/default/i2pd
+/etc/conf.d/i2pd
 .RS 4
-i2pd configuration file (when running as a system service)
-
+i2pd service configuration file
+.RE
+.PP
+/etc/i2pd.conf
+.RS 4
+i2pd configuration file (when running as a system service). You may override the parameters here.
 .RE
 .PP
 /var/lib/i2pd/
@@ -94,14 +93,9 @@ i2pd profile directory (when running as a system service, see \fB\-\-service=\fR
 $HOME/.i2pd
 .RS 4
 i2pd profile directory (when running as a normal user)
-.RE
-.PP
-/usr/share/doc/i2pd/examples/hosts.txt.gz
-.RS 4
-default I2P hosts file
 .SH AUTHOR
-This manual page was written by kytv <killyourtv@i2pmail.org> for the Debian system (but may be used by others).
+This manual page was written by kytv <killyourtv@i2pmail.org> for the Debian system (but may be used by others). And adapted by Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org> to Gentoo.
 .BR
 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation
 .BR
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL
+On Gentoo systems, the complete text of the GNU General Public License Version 2 can be found in /usr/portage/licenses/GPL-2
diff --git a/net-misc/i2pd/files/i2pd.conf b/net-misc/i2pd/files/i2pd.conf
index f1c06c0..10675e6 100644
--- a/net-misc/i2pd/files/i2pd.conf
+++ b/net-misc/i2pd/files/i2pd.conf
@@ -1,4 +1,4 @@
 log = 1
-daemon = 0
+daemon = 1
 service = 1
 
diff --git a/net-misc/i2pd/files/i2pd.initd b/net-misc/i2pd/files/i2pd.initd
index b69e4fa..b00a771 100644
--- a/net-misc/i2pd/files/i2pd.initd
+++ b/net-misc/i2pd/files/i2pd.initd
@@ -13,7 +13,7 @@ start() {
         ebegin "Starting ${SVCNAME}"
 	checkpath -f "${I2PD_LOG}" -o "${I2PD_USER}:${I2PD_GROUP}"
 	checkpath -f "${I2PD_PID}" -o "${I2PD_USER}:${I2PD_GROUP}"
-	start-stop-daemon -S -b -u "${I2PD_USER}:${I2PD_GROUP}" -1 "${I2PD_LOG}" /usr/bin/i2pd -- ${I2PDOPTIONS}
+	start-stop-daemon -S -b -u "${I2PD_USER}:${I2PD_GROUP}" /usr/bin/i2pd -- ${I2PDOPTIONS}
         eend $?
 }
 
diff --git a/net-misc/i2pd/files/i2pd.service b/net-misc/i2pd/files/i2pd.service
index c98083c..7f44cde 100644
--- a/net-misc/i2pd/files/i2pd.service
+++ b/net-misc/i2pd/files/i2pd.service
@@ -3,6 +3,7 @@ Description=C++ daemon for accessing the I2P network
 After=network.target
 
 [Service]
+Type=forking
 Restart=on-abnormal
 PIDFile=/var/run/i2pd.pid
 User=i2pd