New directory /var/log/openvpn for log and status files

4 files changed, 48 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index a2b9065..ee80ed5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,11 @@ openvpn (2.4.4-1) UNRELEASED; urgency=medium
   * Remove obsolete syslog.target from debian/openvpn@.service.
   * Update Catalan translation (Closes: #870351).
     - Thanks to Alytidae <alytidae@riseup.net>.
+  * New directory /var/log/openvpn for log and status files
+      (Closes: #444431, #553303):
+    - Add var/log/openvpn into debian/dirs.
+    - New debian/patches/move_log_dir.patch to change the conf files
+      to the new log directory.
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 02 Oct 2017 06:57:42 +0200
 
diff --git a/debian/dirs b/debian/dirs
index e26aab3..2823844 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -9,3 +9,4 @@ usr/share/man/man8
 usr/share/doc/openvpn
 usr/share/openvpn
 usr/include/openvpn
+var/log/openvpn
diff --git a/debian/patches/move_log_dir.patch b/debian/patches/move_log_dir.patch
new file mode 100644
index 0000000..4518461
--- /dev/null
+++ b/debian/patches/move_log_dir.patch
@@ -0,0 +1,41 @@
+Description: Set default logdir to /var/log/openvpn
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=444431
+            https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=553303
+Forwarded: not-needed
+Last-Update: 2017-10-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/sample/sample-config-files/server.conf
+===================================================================
+--- trunk.orig/sample/sample-config-files/server.conf
++++ trunk/sample/sample-config-files/server.conf
+@@ -105,7 +105,7 @@ server 10.8.0.0 255.255.255.0
+ # is restarted, reconnecting clients can be assigned
+ # the same virtual IP address from the pool that was
+ # previously assigned.
+-ifconfig-pool-persist ipp.txt
++ifconfig-pool-persist /var/log/openvpn/ipp.txt
+ 
+ # Configure server mode for ethernet bridging.
+ # You must first use your OS's bridging capability
+@@ -284,7 +284,7 @@ persist-tun
+ # Output a short status file showing
+ # current connections, truncated
+ # and rewritten every minute.
+-status openvpn-status.log
++status /var/log/openvpn/openvpn-status.log
+ 
+ # By default, log messages will go to the syslog (or
+ # on Windows, if running as a service, they will go to
+@@ -293,8 +293,8 @@ status openvpn-status.log
+ # "log" will truncate the log file on OpenVPN startup,
+ # while "log-append" will append to it.  Use one
+ # or the other (but not both).
+-;log         openvpn.log
+-;log-append  openvpn.log
++;log         /var/log/openvpn/openvpn.log
++;log-append  /var/log/openvpn/openvpn.log
+ 
+ # Set the appropriate level of log
+ # file verbosity.
diff --git a/debian/patches/series b/debian/patches/series
index 50b527d..156ff6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+move_log_dir.patch
 auth-pam_libpam_so_filename.patch
 debian_nogroup_for_sample_files.patch
 openvpn-pkcs11warn.patch