aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2017-03-29 14:18:55 +0200
committerGitHub <noreply@github.com>2017-03-29 14:18:55 +0200
commit6f296a789c9cb063ea20c27a5b4f977cf9aeafbf (patch)
tree271d48b9fb0f267fef7a792da8de9bc3138e8f2e
parentf76bcf670543a5b55fff9693cd0303b16b333805 (diff)
parent106e0160f25a8fafa1f13c8fc5d96328f17cd1c0 (diff)
downloadwallabag-6f296a789c9cb063ea20c27a5b4f977cf9aeafbf.tar.gz
wallabag-6f296a789c9cb063ea20c27a5b4f977cf9aeafbf.tar.zst
wallabag-6f296a789c9cb063ea20c27a5b4f977cf9aeafbf.zip
Merge pull request #3000 from cloudron-io/master
Add Cloudron as installation method
-rw-r--r--docs/de/user/installation.rst8
-rw-r--r--docs/en/user/installation.rst20
-rw-r--r--docs/fr/user/installation.rst14
-rw-r--r--docs/it/user/installation.rst7
4 files changed, 40 insertions, 9 deletions
diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst
index 8393455a..403ff6e0 100644
--- a/docs/de/user/installation.rst
+++ b/docs/de/user/installation.rst
@@ -105,6 +105,14 @@ Kommando, um den Container zu starten
105 105
106 docker pull wallabag/wallabag 106 docker pull wallabag/wallabag
107 107
108Cloudron Installation
109~~~~~~~~~~~~~~~~~~~~~~~~
110
111Cloudron bietet einfache Webapp Installation auf deinem Server, mit Fokus auf System Administrator Automatisierung und Updates.
112Ein Wallabag Paket ist direkt zur Installation durch den Cloudron Store verfügbar.
113
114`Installiere wallabag auf deinem Cloudron <https://cloudron.io/store/org.wallabag.cloudronapp.html>`__
115
108Virtualhosts 116Virtualhosts
109------------ 117------------
110 118
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 2c4b8749..81c563f0 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -104,6 +104,14 @@ Command to launch container
104 104
105 docker pull wallabag/wallabag 105 docker pull wallabag/wallabag
106 106
107Installation on Cloudron
108~~~~~~~~~~~~~~~~~~~~~~~~
109
110Cloudron provides an easy way to install webapps on your server with a focus on sysadmin automation and keeping apps updated.
111wallabag is packaged as a Cloudron app and available to install directly from the store.
112
113`Install wallabag on your Cloudron <https://cloudron.io/store/org.wallabag.cloudronapp.html>`__
114
107Virtual hosts 115Virtual hosts
108------------- 116-------------
109 117
@@ -155,9 +163,9 @@ Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you w
155 ErrorLog /var/log/apache2/wallabag_error.log 163 ErrorLog /var/log/apache2/wallabag_error.log
156 CustomLog /var/log/apache2/wallabag_access.log combined 164 CustomLog /var/log/apache2/wallabag_access.log combined
157 </VirtualHost> 165 </VirtualHost>
158 166
159 167
160.. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives : 168.. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives :
161 169
162:: 170::
163 171
@@ -166,12 +174,12 @@ Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you w
166 Allow from All 174 Allow from All
167 175
168 176
169by 177by
170 178
171:: 179::
172 180
173 Require All granted 181 Require All granted
174 182
175 183
176After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld. 184After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld.
177 185
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index 9dcb0efb..9ef8aa11 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -101,6 +101,14 @@ Commande pour démarrer le containeur
101 101
102 docker pull wallabag/wallabag 102 docker pull wallabag/wallabag
103 103
104Installation sur Cloudron
105~~~~~~~~~~~~~~~~~~~~~~~~
106
107Cloudron permet d'installer des applications web sur votre serveur
108wallabag est proposé en tant qu'application Cloudron et est disponible directement depuis le store.
109
110`Installer wallabag sur Cloudron <https://cloudron.io/store/org.wallabag.cloudronapp.html>`__
111
104Virtual hosts 112Virtual hosts
105------------- 113-------------
106 114
@@ -162,12 +170,12 @@ En imaginant que vous vouliez installer wallabag dans le dossier ``/var/www/wall
162 Allow from All 170 Allow from All
163 171
164 172
165par 173par
166 174
167:: 175::
168 176
169 Require All granted 177 Require All granted
170 178
171 179
172 180
173 181
diff --git a/docs/it/user/installation.rst b/docs/it/user/installation.rst
index a79a31d3..8b54fe2c 100644
--- a/docs/it/user/installation.rst
+++ b/docs/it/user/installation.rst
@@ -103,6 +103,13 @@ Comando per avviare il container
103 103
104 docker pull wallabag/wallabag 104 docker pull wallabag/wallabag
105 105
106Installazione su Cloudron
107~~~~~~~~~~~~~~~~~~~~~~~~~
108
109Cloudron fornisce un modo facile di installare webapps sul vostro server mirato ad automatizzare i compiti del sysadmin ed a mantenere le app aggiornate.
110wallabag é pacchettizzata come app Cloudron ed é disponibile all'installazione direttamente dallo store.
111
112`Installa wallabag sul tuo Cloudron <https://cloudron.io/store/org.wallabag.cloudronapp.html>`__
106 113
107Host virtuali 114Host virtuali
108------------- 115-------------