[DRE-commits] [schleuder] 03/06: debian/patches/: Refresh for Debian schleuder release 3.0.1-1
Georg Faerber
georg-alioth-guest at moszumanska.debian.org
Thu Jan 26 14:40:04 UTC 2017
This is an automated email from the git hooks/post-receive script.
georg-alioth-guest pushed a commit to branch master
in repository schleuder.
commit 4a48f7b154a4693151d2d5cc2a98ef0c0703d652
Author: Georg Faerber <georg at riseup.net>
Date: Thu Jan 26 10:18:33 2017 +0100
debian/patches/: Refresh for Debian schleuder release 3.0.1-1
---
...> 0001-lib-fix-paths-and-enable-upgrades.patch} | 28 +++++++++++++++++-----
debian/patches/0002-etc-fix-paths.patch | 26 +-------------------
debian/patches/0003-bin-fix-require.patch | 8 +++----
debian/patches/0004-spec-remove-bundler.patch | 4 ++--
debian/patches/0005-man-fix-log-path.patch | 21 ++++++++++++++++
debian/patches/series | 3 ++-
6 files changed, 52 insertions(+), 38 deletions(-)
diff --git a/debian/patches/0001-lib-fix-paths.patch b/debian/patches/0001-lib-fix-paths-and-enable-upgrades.patch
similarity index 52%
rename from debian/patches/0001-lib-fix-paths.patch
rename to debian/patches/0001-lib-fix-paths-and-enable-upgrades.patch
index 5a0694f..d2f5be6 100644
--- a/debian/patches/0001-lib-fix-paths.patch
+++ b/debian/patches/0001-lib-fix-paths-and-enable-upgrades.patch
@@ -1,8 +1,18 @@
-Description: lib/: Fix paths
+Description: lib/: Fix paths and ignore v2 data
+ Use '/var/log/schleuder' for logging.
+
+ Don't fail if '/var/lib/schleuder' contains data of a schleuder v2
+ installation, to enable upgrades.
+
+ Set the 'root_dir' to '/usr/lib/ruby/vendor_ruby/schleuder/'.
+
+ Additionally, add '/usr/share/schleuder/locales/*.yml' to the locales
+ load path.
+
Upstream is aware of this patch and we're working on integrating it
upstream.
Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2017-01-12
+Last-Update: 2017-01-26
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/lib/schleuder/conf.rb
@@ -15,18 +25,24 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ 'listlogs_dir' => '/var/log/schleuder/lists',
'plugins_dir' => '/etc/schleuder/plugins',
'log_level' => 'warn',
- 'smtp_settings' => {
+ 'keyserver' => 'hkp://pool.sks-keyservers.net',
--- a/lib/schleuder/cli.rb
+++ b/lib/schleuder/cli.rb
-@@ -66,7 +66,7 @@
+@@ -78,13 +78,7 @@
desc 'install', "Set-up or update Schleuder environment (create folders, copy files, fill the database)."
def install
config_dir = Pathname.new(ENV['SCHLEUDER_CONFIG']).dirname
- root_dir = Pathname.new(ENV['SCHLEUDER_ROOT'])
+-
+- # Check if lists_dir contains v2-data.
+- if Dir.glob("#{Conf.lists_dir}/*/*/members.conf").size > 0
+- msg = "Lists directory #{Conf.lists_dir} appears to contain data from a Schleuder version 2.x installation.\nPlease move it out of the way or configure a different `lists_dir` in `#{ENV['SCHLEUDER_CONFIG']}`.\nTo migrate lists from Schleuder v2 to Schleuder v3 please use `schleuder migrate_v2_list` after the installation succeeded."
+- fatal msg, 2
+- end
+ root_dir = Pathname.new('/usr/lib/ruby/vendor_ruby/schleuder/')
- # Check if lists_dir contains v2-data.
- if Dir.glob("#{Conf.lists_dir}/*/*/members.conf").size > 0
+ [Conf.lists_dir, Conf.listlogs_dir, config_dir].each do |dir|
+ dir = Pathname.new(dir)
--- a/lib/schleuder.rb
+++ b/lib/schleuder.rb
@@ -74,6 +74,7 @@
diff --git a/debian/patches/0002-etc-fix-paths.patch b/debian/patches/0002-etc-fix-paths.patch
index 1ec6f46..46950b9 100644
--- a/debian/patches/0002-etc-fix-paths.patch
+++ b/debian/patches/0002-etc-fix-paths.patch
@@ -1,13 +1,9 @@
Description: Fix paths used by upstream
Logs should go into '/var/log/schleuder'.
- Upstream recently switched the list data dir to '/var/lib/schleuder'.
- However, this isn't fixed in the manpage yet, so let's take care of
- this. This part of the patch can be dropped once the next upstream
- version is released.
Author: Georg Faerber <georg at riseup.net>
Reviewed-by: Sebastien Badia <sbadia at debian.org>
-Last-Update: 2017-01-12
+Last-Update: 2017-01-26
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/etc/schleuder.yml
@@ -21,23 +17,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# Schleuder reads plugins also from this directory.
plugins_dir: /etc/schleuder/plugins
---- a/man/schleuder.8
-+++ b/man/schleuder.8
-@@ -64,7 +64,7 @@
- For more information on how to integrate Schleuder with your existing mail setup, please read the Schleuder documentation online (\fISEE ALSO\fR)\.
- .
- .SS "Data storage"
--The keyrings for each list are standard GnuPG keyrings and sit in the filesystem under \fIlists_dir\fR/\fIhostname\fR/\fIlistname\fR/ (\fIlists_dir\fR is read from schleuder\.yml, by default it is </var/schleuder/lists>)\. They can be used manually using gpg2\. Please be careful to maintain proper file permissions if you touch the files\.
-+The keyrings for each list are standard GnuPG keyrings and sit in the filesystem under \fIlists_dir\fR/\fIhostname\fR/\fIlistname\fR/ (\fIlists_dir\fR is read from schleuder\.yml, by default it is </var/lib/schleuder/lists>)\. They can be used manually using gpg2\. Please be careful to maintain proper file permissions if you touch the files\.
- .
- .P
- In the list\-directory there’s also a list specific log\-file (might be missing if the log\-level is high and no error occurred yet)\.
-@@ -135,7 +135,7 @@
- \fB/etc/schleuder/list\-defaults\.yml\fR: default path of default list settings
- .
- .IP "\(bu" 4
--\fB/var/schleuder/\fR default path of lists_dir
-+\fB/var/lib/schleuder/\fR default path of lists_dir
- .
- .IP "\(bu" 4
- \fB<lists_dir>\fR/\fB<hostname>\fR/`\fIlistname\fR: list internal data
diff --git a/debian/patches/0003-bin-fix-require.patch b/debian/patches/0003-bin-fix-require.patch
index 07c6bb6..37007c3 100644
--- a/debian/patches/0003-bin-fix-require.patch
+++ b/debian/patches/0003-bin-fix-require.patch
@@ -3,12 +3,12 @@ Description: bin/: Use 'require' instead of 'require_relative'
'require_relative' as used by upstream doesn't work.
Upstream is aware of this patch and we're working on integrating it.
Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2017-01-12
+Last-Update: 2017-01-26
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/bin/schleuder
+++ b/bin/schleuder
-@@ -4,7 +4,7 @@
+@@ -8,7 +8,7 @@
begin
@@ -26,5 +26,5 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-require_relative '../lib/schleuder.rb'
+require 'schleuder'
- TLS_CERT = Conf.api['tls_cert_file']
- TLS_KEY = Conf.api['tls_key_file']
+
+ %w[tls_cert_file tls_key_file].each do |config_key|
diff --git a/debian/patches/0004-spec-remove-bundler.patch b/debian/patches/0004-spec-remove-bundler.patch
index 568a74e..9dafdcc 100644
--- a/debian/patches/0004-spec-remove-bundler.patch
+++ b/debian/patches/0004-spec-remove-bundler.patch
@@ -2,7 +2,7 @@ Description: spec/: Remove bundler usage
We don't need bundler, because we're using packages.
Upstream is aware of this patch and we're working on integrating it.
Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2017-01-12
+Last-Update: 2017-01-26
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/spec/spec_helper.rb
@@ -14,5 +14,5 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-require 'bundler/setup'
-Bundler.setup
require 'schleuder'
+ require 'schleuder/cli'
require 'database_cleaner'
- require 'factory_girl'
diff --git a/debian/patches/0005-man-fix-log-path.patch b/debian/patches/0005-man-fix-log-path.patch
new file mode 100644
index 0000000..05ca568
--- /dev/null
+++ b/debian/patches/0005-man-fix-log-path.patch
@@ -0,0 +1,21 @@
+Description: man/: Fix logging path
+ We're logging into '/var/log/schleuder', so reflect this in the
+ manpage.
+
+ Upstream is aware of this patch and we're working on integrating it
+ upstream.
+Author: Georg Faerber <georg at riseup.net>
+Last-Update: 2017-01-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/man/schleuder.8
++++ b/man/schleuder.8
+@@ -141,7 +141,7 @@
+ \fB<lists_dir>\fR/\fB<hostname>\fR/`\fIlistname\fR: list internal data
+ .
+ .IP "\(bu" 4
+-\fB<lists_dir>\fR/\fB<hostname>\fR/\fB<listname>\fR/list\.log`: log\-file for list
++\fB/var/log/schleuder\fR/\fB<hostname>\fR/\fB<listname>\fR/list\.log`: log\-file for list
+ .
+ .IP "" 0
+ .
diff --git a/debian/patches/series b/debian/patches/series
index 035e489..e7476bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
-0001-lib-fix-paths.patch
+0005-man-fix-log-path.patch
+0001-lib-fix-paths-and-enable-upgrades.patch
0004-spec-remove-bundler.patch
0003-bin-fix-require.patch
0002-etc-fix-paths.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/schleuder.git
More information about the Pkg-ruby-extras-commits
mailing list