aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-02-22 13:40:15 +0100
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-02-22 13:40:15 +0100
commit2b71f68c95acd20b9ee5e6dc4d67a1ec649fc440 (patch)
treea1f994e03bbd0fdc876dc041ce2b79ad1ad95302
parentcd4d7f4b69e560167754af530ac5afc0534d41fd (diff)
parent437f1985b090c026a130420213d608e1b13e141a (diff)
downloadwallabag-2b71f68c95acd20b9ee5e6dc4d67a1ec649fc440.tar.gz
wallabag-2b71f68c95acd20b9ee5e6dc4d67a1ec649fc440.tar.zst
wallabag-2b71f68c95acd20b9ee5e6dc4d67a1ec649fc440.zip
Merge pull request #1701 from wallabag/v2-maintenance
Fix #1351: add maintenance mode
-rw-r--r--app/AppKernel.php1
-rw-r--r--app/config/config.yml10
-rw-r--r--composer.json3
-rw-r--r--docs/en/developer/maintenance.rst32
-rw-r--r--docs/en/index.rst1
-rw-r--r--docs/fr/developer/maintenance.rst33
-rw-r--r--docs/fr/index.rst1
7 files changed, 80 insertions, 1 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 82d3aa38..08c9cc27 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -34,6 +34,7 @@ class AppKernel extends Kernel
34 new Wallabag\ImportBundle\WallabagImportBundle(), 34 new Wallabag\ImportBundle\WallabagImportBundle(),
35 new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), 35 new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
36 new Craue\ConfigBundle\CraueConfigBundle(), 36 new Craue\ConfigBundle\CraueConfigBundle(),
37 new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
37 ]; 38 ];
38 39
39 if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { 40 if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
diff --git a/app/config/config.yml b/app/config/config.yml
index bd269b07..07a4b0b6 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -200,3 +200,13 @@ scheb_two_factor:
200kphoen_rulerz: 200kphoen_rulerz:
201 executors: 201 executors:
202 doctrine: true 202 doctrine: true
203
204lexik_maintenance:
205 authorized:
206 ips: ['127.0.0.1']
207 driver:
208 ttl: 3600
209 class: 'Lexik\Bundle\MaintenanceBundle\Drivers\DatabaseDriver'
210 response:
211 code: 503
212 status: "wallabag Service Temporarily Unavailable"
diff --git a/composer.json b/composer.json
index c65ebda1..fe6880aa 100644
--- a/composer.json
+++ b/composer.json
@@ -65,7 +65,8 @@
65 "doctrine/doctrine-migrations-bundle": "^1.0", 65 "doctrine/doctrine-migrations-bundle": "^1.0",
66 "paragonie/random_compat": "~1.0", 66 "paragonie/random_compat": "~1.0",
67 "craue/config-bundle": "~1.4", 67 "craue/config-bundle": "~1.4",
68 "mnapoli/piwik-twig-extension": "^1.0" 68 "mnapoli/piwik-twig-extension": "^1.0",
69 "lexik/maintenance-bundle": "~2.1"
69 }, 70 },
70 "require-dev": { 71 "require-dev": {
71 "doctrine/doctrine-fixtures-bundle": "~2.2", 72 "doctrine/doctrine-fixtures-bundle": "~2.2",
diff --git a/docs/en/developer/maintenance.rst b/docs/en/developer/maintenance.rst
new file mode 100644
index 00000000..8277fb1f
--- /dev/null
+++ b/docs/en/developer/maintenance.rst
@@ -0,0 +1,32 @@
1Maintenance mode
2================
3
4If you have some long tasks to do on your wallabag instance, you can enable a maintenance mode.
5Nobody will have access to your instance.
6
7Enable maintenance mode
8-----------------------
9
10To enable maintenance mode, execute this command:
11
12::
13
14 bin/console lexik:maintenance:lock --no-interaction
15
16You can set your IP address in ``app/config/config.yml`` if you want to access to wallabag even if maintenance mode is enabled. For example:
17
18::
19
20 lexik_maintenance:
21 authorized:
22 ips: ['127.0.0.1']
23
24
25Disable maintenance mode
26------------------------
27
28To disable maintenance mode, execute this command:
29
30::
31
32 bin/console lexik:maintenance:unlock
diff --git a/docs/en/index.rst b/docs/en/index.rst
index 17e375d2..1bac9ed7 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -41,3 +41,4 @@ The main documentation for this application is organized into a couple sections:
41 41
42 developer/docker 42 developer/docker
43 developer/translate 43 developer/translate
44 developer/maintenance
diff --git a/docs/fr/developer/maintenance.rst b/docs/fr/developer/maintenance.rst
new file mode 100644
index 00000000..4ea8d01f
--- /dev/null
+++ b/docs/fr/developer/maintenance.rst
@@ -0,0 +1,33 @@
1Mode maintenance
2================
3
4Si vous devez effectuer de longues tâches sur votre instance de wallabag, vous pouvez activer le mode maintenance.
5Plus personne ne pourra accéder à wallabag.
6
7Activer le mode maintenance
8---------------------------
9
10Pour activer le mode maintenance, exécutez cette commande :
11
12::
13
14 bin/console lexik:maintenance:lock --no-interaction
15
16Vous pouvez spécifier votre adresse IP dans ``app/config/config.yml`` si vous souhaitez accéder à wallabag même si
17 le mode maintenance est activé. Par exemple :
18
19::
20
21 lexik_maintenance:
22 authorized:
23 ips: ['127.0.0.1']
24
25
26Désactiver le mode maintenance
27------------------------------
28
29Pour désactiver le mode maintenance, exécutez cette commande :
30
31::
32
33 bin/console lexik:maintenance:unlock
diff --git a/docs/fr/index.rst b/docs/fr/index.rst
index a47b8a62..af5ed14f 100644
--- a/docs/fr/index.rst
+++ b/docs/fr/index.rst
@@ -42,3 +42,4 @@ La documentation principale de cette application est découpée en plusieurs sec
42 42
43 developer/docker 43 developer/docker
44 developer/translate 44 developer/translate
45 developer/maintenance