Skip to content

Commit 6413fae

Browse files
authored
Fixes 705 - Remove superflous include snippets
1 parent 44b0145 commit 6413fae

14 files changed

+277
-276
lines changed

admin/console-rails-shell.include.rst

Lines changed: 0 additions & 11 deletions
This file was deleted.

api/generic-cti/cti-endpoint-limitations.include.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

api/generic-cti/index.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@ Generic CTI
33

44
This page describes the generic CTI API scopes and functionalities.
55

6-
.. include:: /api/generic-cti/cti-endpoint-limitations.include.rst
6+
.. warning:: **🚧 Limitations / Notes 🚧**
7+
8+
* Authentication on this endpoint works fundamentally different compared to
9+
the rest of the API.
10+
* API clients *do not* work with the CTI endpoints unless explicitly stated
11+
by the client vendor!
12+
* The CTI endpoints are relevant for PBX systems only.
13+
714

815
Features
916
Here's a small condensed list of the possibilities this CTI API provides.

appendix/migrate-to-postgresql.rst

Lines changed: 68 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,68 @@ Preparation
2828
Install PostgreSQL
2929
^^^^^^^^^^^^^^^^^^
3030

31-
.. include:: /install/includes/postgres-installation.rst
31+
.. tabs::
32+
33+
.. tab:: Ubuntu / Debian
34+
35+
.. code-block:: console
36+
37+
$ sudo apt update
38+
39+
.. code-block:: console
40+
41+
$ sudo apt install postgresql postgresql-contrib
42+
43+
.. code-block:: console
44+
45+
$ sudo systemctl start postgresql
46+
47+
.. code-block:: console
48+
49+
$ sudo systemctl enable postgresql
50+
51+
.. tab:: CentOS
52+
53+
.. code-block:: console
54+
55+
$ sudo yum install postgresql-server postgresql-contrib
56+
57+
.. code-block:: console
58+
59+
$ sudo postgresql-setup initdb
60+
61+
.. code-block:: console
62+
63+
$ sudo systemctl start postgresql
64+
65+
66+
.. code-block:: console
67+
68+
$ sudo systemctl enable postgresql
69+
70+
.. tab:: OpenSUSE / SLES
71+
72+
.. code-block:: console
73+
74+
$ sudo zypper refresh
75+
76+
.. code-block:: console
77+
78+
$ sudo zypper install postgresql postgresql-server postgresql-contrib
79+
80+
openSuSE 15 also requires:
81+
82+
.. code-block:: console
83+
84+
$ sudo zypper install postgresql-server-devel
85+
86+
.. code-block:: console
87+
88+
$ sudo systemctl start postgresql
89+
90+
.. code-block:: console
91+
92+
$ sudo systemctl enable postgresql
3293
3394
Please also have a look at :doc:`/appendix/configure-database-server`.
3495

@@ -95,8 +156,13 @@ Database Credentials
95156
Adjust the configuration file to fill in the credentials for your new
96157
PostgreSQL server. Use ``postgresql`` as ``adapter``.
97158

159+
.. tip::
160+
161+
**🤓 For easiest usage ...**
98162

99-
.. include:: /install/includes/postgres-permissions.rst
163+
If you provide your Zammad user with database creation permission, you can
164+
run ``db:create`` in the following section. If you don't want that, you'll
165+
have to create the database manually.
100166

101167
Create Empty Database
102168
^^^^^^^^^^^^^^^^^^^^^

appendix/reporting-tools-thirdparty.rst

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,25 @@ This guide will discuss how to set up third party reporting tools with Zammad.
1818
also check :admin-docs:`the Elasticsearch integration </system/integrations/elasticsearch.html>`
1919
page for information on how to hook your tool to the index.
2020
21-
.. include:: reporting-tools-thirdparty/include-limitations.rst
21+
.. note:: **🚧 Limitations 🚧**
22+
23+
Please note that this guide expects all requirements to be up and running.
24+
We will not cover core configurations of each tool. Please also note that
25+
we can't support you with configuration of your specific third party tool.
26+
27+
**🤓 Specific use cases**
28+
29+
You may have specific use cases which we can't cover in this documentation.
30+
The following sub pages and also our
31+
:doc:`/install/elasticsearch/indexed-attributes` should provide enough
32+
information to help you!
2233

2334
Getting Started
2435
---------------
2536

2637
You will need
2738

28-
* A instance of the reporting tool of your choice (hosted or self-hosted)
39+
* An instance of the reporting tool of your choice (hosted or self-hosted)
2940

3041
.. include:: reporting-tools-thirdparty/include-requirements.rst
3142

appendix/reporting-tools-thirdparty/grafana.rst

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,18 @@ installation stores within the Elasticsearch indexes.
99
:width: 90%
1010
:align: center
1111

12-
.. include:: include-limitations.rst
12+
.. note:: **🚧 Limitations 🚧**
13+
14+
Please note that this guide expects all requirements to be up and running.
15+
We will not cover core configurations of each tool. Please also note that
16+
we can't support you with configuration of your specific third party tool.
17+
18+
**🤓 Specific use cases**
19+
20+
You may have specific use cases which we can't cover in this documentation.
21+
The following sub pages and also our
22+
:doc:`/install/elasticsearch/indexed-attributes` should provide enough
23+
information to help you!
1324

1425
Overview
1526
--------

appendix/reporting-tools-thirdparty/include-limitations.rst

Lines changed: 0 additions & 12 deletions
This file was deleted.

install/includes/firewall-and-selinux.rst

Lines changed: 0 additions & 129 deletions
This file was deleted.

install/includes/manage-services.rst

Lines changed: 0 additions & 21 deletions
This file was deleted.

install/includes/next-steps.rst

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)