From ac6bab4cd7a6966aaabe5b6daf8bdc178e4272e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 8 Oct 2017 15:48:57 +0300 Subject: [PATCH] setup attachments to /var/lib/eventum/storage (if enabled) --- eventum-paths.patch | 22 ++++++++++++++++++++++ eventum.spec | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/eventum-paths.patch b/eventum-paths.patch index 428ec56..6baaa05 100644 --- a/eventum-paths.patch +++ b/eventum-paths.patch @@ -59,3 +59,25 @@ if (!defined('SPHINX_LOG_PATH')) { define('SPHINX_LOG_PATH', '/var/log/sphinx/'); +--- eventum-3.3.0/src/Attachment/StorageManager.php~ 2017-07-19 23:14:28.000000000 +0300 ++++ eventum-3.3.0/src/Attachment/StorageManager.php 2017-10-08 15:47:26.170890911 +0300 +@@ -50,7 +50,7 @@ + $mount_config = [ + 'pdo' => $this->getPdoAdapter(), + 'legacy' => new Filesystem(new EventumLegacyAdapter()), +- 'local' => new Filesystem(new Local(APP_PATH . '/var/storage/')), ++ 'local' => new Filesystem(new Local('/var/lib/eventum/storage')), + ]; + + foreach ($setup['adapters'] as $adapter_name => $adapter_config) { +--- eventum-3.3.0/contrib/migrate_storage_adapter.php~ 2017-10-05 04:42:47.000000000 +0300 ++++ eventum-3.3.0/contrib/migrate_storage_adapter.php 2017-10-08 15:50:45.151352787 +0300 +@@ -124,7 +124,7 @@ + + if ($this->target_adapter === 'local') { + // try to set the timestamp on the filesystem to match what is stored in the database +- $fs_path = str_replace('local://', APP_PATH . '/var/storage/', $new_path); ++ $fs_path = str_replace('local://', '/var/lib/eventum/storage/', $new_path); + $created_date = strtotime($file['iat_created_date']); + touch($fs_path, $created_date); + } diff --git a/eventum.spec b/eventum.spec index 2173174..3321d07 100644 --- a/eventum.spec +++ b/eventum.spec @@ -431,7 +431,7 @@ install -d \ $RPM_BUILD_ROOT/etc/{rc.d/init.d,cron.d,logrotate.d,sysconfig} \ $RPM_BUILD_ROOT/var/{run,cache,lib}/%{name} \ $RPM_BUILD_ROOT/var/log/{archive/,}%{name} \ - $RPM_BUILD_ROOT/var/lib/%{name}/routed_{emails,drafts,notes} \ + $RPM_BUILD_ROOT/var/lib/%{name}/{routed_{emails,drafts,notes},storage} \ $RPM_BUILD_ROOT%{systemdtmpfilesdir} %{__make} install-eventum install-cli install-localization \ @@ -646,6 +646,8 @@ done %attr(770,root,http) %dir /var/lib/%{name}/routed_emails %attr(770,root,http) %dir /var/lib/%{name}/routed_drafts %attr(770,root,http) %dir /var/lib/%{name}/routed_notes +# attachment storage +%attr(770,root,http) %dir /var/lib/%{name}/storage %files setup %defattr(644,root,root,755) -- 2.44.0