diff options
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/capistrano/deploy.rb | 9 | ||||
-rw-r--r-- | app/config/config.yml | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/app/config/capistrano/deploy.rb b/app/config/capistrano/deploy.rb index f15eef30..fee04620 100644 --- a/app/config/capistrano/deploy.rb +++ b/app/config/capistrano/deploy.rb | |||
@@ -1,9 +1,4 @@ | |||
1 | # config valid only for current version of Capistrano | 1 | # config valid only for current version of Capistrano |
2 | lock '3.4.0' | ||
3 | |||
4 | set :log_path, "var/logs" | ||
5 | set :cache_path, "var/cache" | ||
6 | set :symfony_console_path, 'bin/console' | ||
7 | 2 | ||
8 | set :application, 'wallabag' | 3 | set :application, 'wallabag' |
9 | set :repo_url, 'git@github.com:wallabag/wallabag.git' | 4 | set :repo_url, 'git@github.com:wallabag/wallabag.git' |
@@ -11,8 +6,6 @@ set :repo_url, 'git@github.com:wallabag/wallabag.git' | |||
11 | set :ssh_user, 'framasoft_bag' | 6 | set :ssh_user, 'framasoft_bag' |
12 | server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db} | 7 | server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db} |
13 | 8 | ||
14 | set :scm, :git | ||
15 | |||
16 | set :format, :pretty | 9 | set :format, :pretty |
17 | set :log_level, :info | 10 | set :log_level, :info |
18 | # set :log_level, :debug | 11 | # set :log_level, :debug |
@@ -23,4 +16,4 @@ set :linked_files, %w{app/config/parameters.yml} | |||
23 | set :linked_dirs, [fetch(:log_path), "var/sessions", "web/uploads", "data"] | 16 | set :linked_dirs, [fetch(:log_path), "var/sessions", "web/uploads", "data"] |
24 | set :keep_releases, 3 | 17 | set :keep_releases, 3 |
25 | 18 | ||
26 | after 'deploy:finishing', 'deploy:cleanup' | 19 | after 'deploy:updated', 'symfony:cache:clear' |
diff --git a/app/config/config.yml b/app/config/config.yml index dfb0e3b2..7f24244d 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -44,13 +44,15 @@ wallabag_core: | |||
44 | es: 'Español' | 44 | es: 'Español' |
45 | oc: 'Occitan' | 45 | oc: 'Occitan' |
46 | it: 'Italiano' | 46 | it: 'Italiano' |
47 | pt: 'Português' | ||
47 | items_on_page: 12 | 48 | items_on_page: 12 |
48 | theme: material | 49 | theme: material |
49 | language: '%locale%' | 50 | language: '%locale%' |
50 | rss_limit: 50 | 51 | rss_limit: 50 |
51 | reading_speed: 1 | 52 | reading_speed: 1 |
52 | cache_lifetime: 10 | 53 | cache_lifetime: 10 |
53 | fetching_error_message: "wallabag can't retrieve contents for this article. Please report this issue to us." | 54 | fetching_error_message: | |
55 | wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. | ||
54 | 56 | ||
55 | wallabag_user: | 57 | wallabag_user: |
56 | registration_enabled: "%fosuser_registration%" | 58 | registration_enabled: "%fosuser_registration%" |