--- contrib/i2pd.conf.orig	2023-06-12 13:33:21 UTC
+++ contrib/i2pd.conf
@@ -8,19 +8,19 @@
 
 ## Tunnels config file
 ## Default: ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf
-# tunconf = /var/lib/i2pd/tunnels.conf
+tunconf = %%ETCDIR%%/tunnels.conf
 
 ## Tunnels config files path
 ## Use that path to store separated tunnels in different config files.
 ## Default: ~/.i2pd/tunnels.d or /var/lib/i2pd/tunnels.d
-# tunnelsdir = /var/lib/i2pd/tunnels.d
+tunnelsdir = %%ETCDIR%%/tunnels.d
 
 ## Path to certificates used for verifying .su3, families
-## Default: ~/.i2pd/certificates or /var/lib/i2pd/certificates
-# certsdir = /var/lib/i2pd/certificates
+## Default: ~/.i2pd/certificates or %%CERTSDIR%%
+# certsdir = %%CERTSDIR%%
 
 ## Where to write pidfile (default: /run/i2pd.pid, not used in Windows)
-# pidfile = /run/i2pd.pid
+pidfile = /var/run/i2pd/i2pd.pid
 
 ## Logging configuration section
 ## By default logs go to stdout with level 'info' and higher