aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-11-06 21:47:16 +0100
committerGitHub <noreply@github.com>2016-11-06 21:47:16 +0100
commit01ad4d6a89f52bdbf21ab2b14e3fe9291f2a9290 (patch)
tree2090dfc06db67491d3bf778379cdf8f759c5ee23
parentb5571b52ccbc11d71637e1ccb07421cf606ac846 (diff)
parentdb3838545cef117e05c63afc1e7ebfdf8c8d3a4e (diff)
downloadwallabag-01ad4d6a89f52bdbf21ab2b14e3fe9291f2a9290.tar.gz
wallabag-01ad4d6a89f52bdbf21ab2b14e3fe9291f2a9290.tar.zst
wallabag-01ad4d6a89f52bdbf21ab2b14e3fe9291f2a9290.zip
Merge pull request #2551 from wallabag/remove-maintenance-bundle
Removed Maintenance bundle
-rw-r--r--app/AppKernel.php1
-rw-r--r--app/config/config.yml10
-rw-r--r--composer.json1
-rw-r--r--docs/de/developer/maintenance.rst32
-rw-r--r--docs/de/index.rst1
-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
9 files changed, 0 insertions, 112 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 52f85558..342bd139 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -29,7 +29,6 @@ class AppKernel extends Kernel
29 new KPhoen\RulerZBundle\KPhoenRulerZBundle(), 29 new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
30 new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), 30 new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
31 new Craue\ConfigBundle\CraueConfigBundle(), 31 new Craue\ConfigBundle\CraueConfigBundle(),
32 new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
33 new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(), 32 new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
34 33
35 // wallabag bundles 34 // wallabag bundles
diff --git a/app/config/config.yml b/app/config/config.yml
index 7f24244d..0dc5809a 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -236,16 +236,6 @@ kphoen_rulerz:
236 executors: 236 executors:
237 doctrine: true 237 doctrine: true
238 238
239lexik_maintenance:
240 authorized:
241 ips: ['127.0.0.1']
242 driver:
243 ttl: 3600
244 class: 'Lexik\Bundle\MaintenanceBundle\Drivers\DatabaseDriver'
245 response:
246 code: 503
247 status: "wallabag Service Temporarily Unavailable"
248
249old_sound_rabbit_mq: 239old_sound_rabbit_mq:
250 connections: 240 connections:
251 default: 241 default:
diff --git a/composer.json b/composer.json
index e7b30fa1..f4ba695b 100644
--- a/composer.json
+++ b/composer.json
@@ -77,7 +77,6 @@
77 "paragonie/random_compat": "~1.0", 77 "paragonie/random_compat": "~1.0",
78 "craue/config-bundle": "~1.4", 78 "craue/config-bundle": "~1.4",
79 "mnapoli/piwik-twig-extension": "^1.0", 79 "mnapoli/piwik-twig-extension": "^1.0",
80 "lexik/maintenance-bundle": "~2.1",
81 "ocramius/proxy-manager": "1.*", 80 "ocramius/proxy-manager": "1.*",
82 "white-october/pagerfanta-bundle": "^1.0", 81 "white-october/pagerfanta-bundle": "^1.0",
83 "php-amqplib/rabbitmq-bundle": "^1.8", 82 "php-amqplib/rabbitmq-bundle": "^1.8",
diff --git a/docs/de/developer/maintenance.rst b/docs/de/developer/maintenance.rst
deleted file mode 100644
index 31343876..00000000
--- a/docs/de/developer/maintenance.rst
+++ /dev/null
@@ -1,32 +0,0 @@
1Wartungsmodus
2=============
3
4Wenn du längere Aufgaben auf deiner wallabag Instanz ausführen willst, kannst du den Wartungsmodus aktivieren.
5Keiner wird dann Zugang zu deiner Instanz haben.
6
7Aktivieren des Wartungsmodus
8----------------------------
9
10Um den Wartungsmodus zu aktivieren, führe folgendes Kommando aus:
11
12::
13
14 bin/console lexik:maintenance:lock -e=prod --no-interaction
15
16Du kannst deine IP Adresse in ``app/config/config.yml`` setzen, wenn du Zugriff zu wallabag haben willst, auch wenn der Wartungsmodus aktiv ist. Zum Beispiel:
17
18::
19
20 lexik_maintenance:
21 authorized:
22 ips: ['127.0.0.1']
23
24
25Deaktivieren des Wartungsmodus
26------------------------
27
28Um den Wartungsmodus zu deaktivieren, führe dieses Kommando aus:
29
30::
31
32 bin/console lexik:maintenance:unlock -e=prod
diff --git a/docs/de/index.rst b/docs/de/index.rst
index b422bf83..8f5b1361 100644
--- a/docs/de/index.rst
+++ b/docs/de/index.rst
@@ -57,6 +57,5 @@ Die Dokumentation ist in anderen Sprachen verfügbar :
57 developer/docker 57 developer/docker
58 developer/documentation 58 developer/documentation
59 developer/translate 59 developer/translate
60 developer/maintenance
61 developer/redis 60 developer/redis
62 developer/rabbitmq 61 developer/rabbitmq
diff --git a/docs/en/developer/maintenance.rst b/docs/en/developer/maintenance.rst
deleted file mode 100644
index 6d55ed60..00000000
--- a/docs/en/developer/maintenance.rst
+++ /dev/null
@@ -1,32 +0,0 @@
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 -e=prod
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 -e=prod
diff --git a/docs/en/index.rst b/docs/en/index.rst
index 0ead261b..6fe33c76 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -58,6 +58,5 @@ The documentation is available in other languages:
58 developer/docker 58 developer/docker
59 developer/documentation 59 developer/documentation
60 developer/translate 60 developer/translate
61 developer/maintenance
62 developer/redis 61 developer/redis
63 developer/rabbitmq 62 developer/rabbitmq
diff --git a/docs/fr/developer/maintenance.rst b/docs/fr/developer/maintenance.rst
deleted file mode 100644
index 8007a85f..00000000
--- a/docs/fr/developer/maintenance.rst
+++ /dev/null
@@ -1,33 +0,0 @@
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 -e=prod
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 -e=prod
diff --git a/docs/fr/index.rst b/docs/fr/index.rst
index dbb85910..dae62f43 100644
--- a/docs/fr/index.rst
+++ b/docs/fr/index.rst
@@ -58,6 +58,5 @@ La documentation est disponible dans d'autres langues :
58 developer/docker 58 developer/docker
59 developer/documentation 59 developer/documentation
60 developer/translate 60 developer/translate
61 developer/maintenance
62 developer/redis 61 developer/redis
63 developer/rabbitmq 62 developer/rabbitmq