Skip to content

Commit

Permalink
Fixes #428 - Changed S3 setup.
Browse files Browse the repository at this point in the history
  • Loading branch information
ralf401 committed Dec 7, 2023
1 parent 900c32f commit 4152625
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 21 deletions.
32 changes: 16 additions & 16 deletions locale/admin-docs.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad Admin Documentation pre-release\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-12-05 15:23+0100\n"
"POT-Creation-Date: 2023-12-07 16:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -13507,7 +13507,7 @@ msgstr ""
msgid "While Zammad is beeing updated, it enforces a recursive \"change owner\" (chown) for this directory. For instances with many files this can be time consuming. To mitigate that you can move your files and create a symlink in ``/opt/zammad/storage/`` to the new directory. Of course you have to make sure on your own that the permissions are always correct."
msgstr ""

#: ../settings/system/storage.rst:85
#: ../settings/system/storage.rst:86
msgid "Simple Storage (S3)"
msgstr ""

Expand Down Expand Up @@ -13548,39 +13548,39 @@ msgid "We recommend the deletion of the not used configuration style to avoid in
msgstr ""

#: ../settings/system/storage.rst:55
msgid "Set the \"Storage Mechanism\" in Zammad to ``Simple Storage (S3)`` in Settings > System > Storage and click on \"Submit\". After that, Zammad checks your configuration and the connection to the service and will raise an error message if something is wrong."
msgid "Restart Zammad so the config file / environment variable is loaded"
msgstr ""

#: ../settings/system/storage.rst:59
msgid "Restart Zammad that the changes take effect"
#: ../settings/system/storage.rst:56
msgid "Set the \"Storage Mechanism\" in Zammad to ``Simple Storage (S3)`` in Settings > System > Storage and click on \"Submit\". After that, Zammad checks your configuration and the connection to the service and will raise an error message if something is wrong."
msgstr ""

#: ../settings/system/storage.rst:61
#: ../settings/system/storage.rst:62
msgid "A very simple storage configuration could look like this:"
msgstr ""

#: ../settings/system/storage.rst:74
msgid "Before setting the storage mechanism to ``Simple Storage (S3)`` (step 3), please make sure to have a working setup."
#: ../settings/system/storage.rst:75
msgid "Before setting the storage mechanism to ``Simple Storage (S3)`` (step 4), please make sure to have a working setup."
msgstr ""

#: ../settings/system/storage.rst:77
#: ../settings/system/storage.rst:78
msgid "You can verify this by running ``rails r 'Rails.logger = Logger.new(STDOUT); pp Store::Provider::S3.ping?'`` in your Zammad directory. If everything is fine, you should see ``true``, else you should see ``false`` and a simple error message."
msgstr ""

#: ../settings/system/storage.rst:82
#: ../settings/system/storage.rst:83
msgid "If you installed Zammad through a package manager (rather than from source), replace ``rails r`` with ``zammad run rails r`` above. To learn more, see :docs:`Administration via Console </admin/console.html>`."
msgstr ""

#: ../settings/system/storage.rst:89
#: ../settings/system/storage.rst:90
msgid "🤔 **But which one to use?**"
msgstr ""

#: ../settings/system/storage.rst:91
#: ../settings/system/storage.rst:92
msgid "We strongly encourage you to use filesystem storage on busy instances instead of \"Database\". This will greatly improve system performance (de-crease database load and size)."
msgstr ""

#: ../settings/system/storage.rst:98
msgid "Moving attachments from Database to Filesystem can be run during production use. However, you should consider your framework conditions (e.g. bandwith, system load in production) to define the right moment."
#: ../settings/system/storage.rst:99
msgid "Moving attachments from \"Database\" to \"Filesystem\" can be run during production use. However, you should consider your framework conditions (e.g. bandwidth, system load in production) to define the right moment."
msgstr ""

#: ../settings/ticket.rst:6
Expand Down Expand Up @@ -14710,7 +14710,7 @@ msgid "What ticket state should be applied when “auto-closing” a ticket?"
msgstr ""

#: ../system/integrations/checkmk/admin-panel-reference.rst:26
msgid "You can choose from the seven built-in ticket states. If these states aren't enough for you, you can :ref:`define a new ticket state <ticket-state-reference>` for this purpose as well. This can be especially useful for tracking tickets with :doc:`reports </manage/report-profiles>`."
msgid "(You may choose from the seven built-in ticket states, but if you change this setting from the default, you'll more likely want to :docs:`define a new ticket state </admin/console/working-on-tickets.html#add-new-ticket-state>` for this purpose. This can be especially useful for tracking tickets with :doc:`reports </manage/report-profiles>`.)"
msgstr ""

#: ../system/integrations/checkmk/admin-panel-reference.rst:35
Expand Down Expand Up @@ -17383,7 +17383,7 @@ msgid "Enable **API Token Access** in Settings > System > API."
msgstr ""

#: ../system/integrations/zabbix.rst:20
msgid "2. Create a **new user** for a Zabbix alerter with an **email address** and create a personal user token with **ticket.agent** permissions."
msgid "Create a **new user** for a Zabbix alerter with an **email address** and create a personal user token with **ticket.agent** permissions."
msgstr ""

#: ../system/integrations/zabbix.rst:24
Expand Down
11 changes: 6 additions & 5 deletions settings/system/storage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@ Simple Storage (S3)
- We recommend the deletion of the not used configuration style to avoid
inconsistencies.

3. Set the "Storage Mechanism" in Zammad to ``Simple Storage (S3)`` in
3. Restart Zammad so the config file / environment variable is loaded
4. Set the "Storage Mechanism" in Zammad to ``Simple Storage (S3)`` in
Settings > System > Storage and click on "Submit". After that, Zammad
checks your configuration and the connection to the service and will raise
an error message if something is wrong.
4. Restart Zammad that the changes take effect


A very simple storage configuration could look like this:

Expand All @@ -71,7 +72,7 @@ Simple Storage (S3)
.. tip::

Before setting the storage mechanism to ``Simple Storage (S3)`` (step 3),
Before setting the storage mechanism to ``Simple Storage (S3)`` (step 4),
please make sure to have a working setup.

You can verify this by running
Expand All @@ -95,6 +96,6 @@ Simple Storage (S3)

.. tip::

Moving attachments from Database to Filesystem can be run during
Moving attachments from "Database" to "Filesystem" can be run during
production use. However, you should consider your framework conditions
(e.g. bandwith, system load in production) to define the right moment.
(e.g. bandwidth, system load in production) to define the right moment.

0 comments on commit 4152625

Please sign in to comment.