aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-01-21 08:53:09 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-01-31 14:48:26 +0100
commit63e40f2d7c4074aff0be587c828eb511a6b7c878 (patch)
tree038959b20e15c60841f8f3584c99068f52460939 /app/config
parent26975877d76a99f6a3153d3d3b4fc6c9f32687bc (diff)
downloadwallabag-63e40f2d7c4074aff0be587c828eb511a6b7c878.tar.gz
wallabag-63e40f2d7c4074aff0be587c828eb511a6b7c878.tar.zst
wallabag-63e40f2d7c4074aff0be587c828eb511a6b7c878.zip
Add CraueConfig for internal settings
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml24
-rw-r--r--app/config/parameters.yml.dist28
-rw-r--r--app/config/routing.yml9
-rw-r--r--app/config/security.yml1
-rw-r--r--app/config/tests/parameters.yml.dist.mysql28
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql28
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite28
7 files changed, 15 insertions, 131 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 58e1dd66..3c278ea6 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -28,6 +28,8 @@ framework:
28 assets: ~ 28 assets: ~
29 29
30wallabag_core: 30wallabag_core:
31 version: 2.0.0-alpha.1
32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
31 languages: 33 languages:
32 en: 'English' 34 en: 'English'
33 fr: 'Français' 35 fr: 'Français'
@@ -46,28 +48,6 @@ wallabag_import:
46twig: 48twig:
47 debug: "%kernel.debug%" 49 debug: "%kernel.debug%"
48 strict_variables: "%kernel.debug%" 50 strict_variables: "%kernel.debug%"
49 globals:
50 share_twitter: %share_twitter%
51 share_mail: %share_mail%
52 share_shaarli: %share_shaarli%
53 shaarli_url: %shaarli_url%
54 share_diaspora: %share_diaspora%
55 diaspora_url: %diaspora_url%
56 flattr: %flattr%
57 flattrable: 1
58 flattred: 2
59 carrot: %carrot%
60 show_printlink: %show_printlink%
61 export_epub: %export_epub%
62 export_mobi: %export_mobi%
63 export_pdf: %export_pdf%
64 export_csv: %export_csv%
65 export_json: %export_json%
66 export_txt: %export_txt%
67 export_xml: %export_xml%
68 version: %app.version%
69 twofactor_auth: %twofactor_auth%
70 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
71 form_themes: 51 form_themes:
72 - "LexikFormFilterBundle:Form:form_div_layout.html.twig" 52 - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
73 53
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 52d26cb4..3eeedb78 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -37,32 +37,6 @@ parameters:
37 # A secret key that's used to generate certain security-related tokens 37 # A secret key that's used to generate certain security-related tokens
38 secret: ThisTokenIsNotSoSecretChangeIt 38 secret: ThisTokenIsNotSoSecretChangeIt
39 39
40 # wallabag misc 40 # two factor stuff
41 app.version: 2.0.0-alpha
42 twofactor_auth: true 41 twofactor_auth: true
43 twofactor_sender: no-reply@wallabag.org 42 twofactor_sender: no-reply@wallabag.org
44
45 download_pictures: false # if true, pictures will be stored into data/assets for each article
46
47 # Entry view
48 share_twitter: true
49 share_mail: true
50 share_shaarli: true
51 shaarli_url: http://myshaarli.com
52 share_diaspora: true
53 diaspora_url: http://diasporapod.com
54 flattr: true
55 carrot: true
56 show_printlink: true
57 export_epub: true
58 export_mobi: true
59 export_pdf: true
60 export_csv: true
61 export_json: true
62 export_txt: true
63 export_xml: true
64 wallabag_url: http://v2.wallabag.org
65 wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
66
67 # pocket import
68 pocket_consumer_key: xxxxxxxx
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 84b98d23..c491d35d 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -22,7 +22,9 @@ rest :
22 22
23homepage: 23homepage:
24 path: "/{page}" 24 path: "/{page}"
25 defaults: { _controller: WallabagCoreBundle:Entry:showUnread, page : 1 } 25 defaults:
26 _controller: WallabagCoreBundle:Entry:showUnread
27 page : 1
26 requirements: 28 requirements:
27 page: \d+ 29 page: \d+
28 30
@@ -31,3 +33,8 @@ fos_user:
31 33
32fos_oauth_server_token: 34fos_oauth_server_token:
33 resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml" 35 resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"
36
37craue_config_settings_modify:
38 path: /settings
39 defaults:
40 _controller: CraueConfigBundle:Settings:modify
diff --git a/app/config/security.yml b/app/config/security.yml
index a99a7d80..6f20490b 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -58,3 +58,4 @@ security:
58 - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } 58 - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
59 - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } 59 - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
60 - { path: ^/, roles: ROLE_USER } 60 - { path: ^/, roles: ROLE_USER }
61 - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index 073f6c27..3244fd3a 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -27,32 +27,6 @@ parameters:
27 # A secret key that's used to generate certain security-related tokens 27 # A secret key that's used to generate certain security-related tokens
28 secret: ThisTokenIsNotSoSecretChangeIt 28 secret: ThisTokenIsNotSoSecretChangeIt
29 29
30 # wallabag misc 30 # two factor stuff
31 app.version: 2.0.0-alpha
32 twofactor_auth: true 31 twofactor_auth: true
33 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
34
35 download_pictures: false # if true, pictures will be stored into data/assets for each article
36
37 # Entry view
38 share_twitter: true
39 share_mail: true
40 share_shaarli: true
41 shaarli_url: http://myshaarli.com
42 share_diaspora: true
43 diaspora_url: http://diasporapod.com
44 flattr: true
45 carrot: true
46 show_printlink: true
47 export_epub: true
48 export_mobi: true
49 export_pdf: true
50 export_csv: true
51 export_json: true
52 export_txt: true
53 export_xml: true
54 wallabag_url: http://v2.wallabag.org
55 wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
56
57 # pocket import
58 pocket_consumer_key: xxxxxxxx
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index 24a1818a..cee34473 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -27,32 +27,6 @@ parameters:
27 # A secret key that's used to generate certain security-related tokens 27 # A secret key that's used to generate certain security-related tokens
28 secret: ThisTokenIsNotSoSecretChangeIt 28 secret: ThisTokenIsNotSoSecretChangeIt
29 29
30 # wallabag misc 30 # two factor stuff
31 app.version: 2.0.0-alpha
32 twofactor_auth: true 31 twofactor_auth: true
33 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
34
35 download_pictures: false # if true, pictures will be stored into data/assets for each article
36
37 # Entry view
38 share_twitter: true
39 share_mail: true
40 share_shaarli: true
41 shaarli_url: http://myshaarli.com
42 share_diaspora: true
43 diaspora_url: http://diasporapod.com
44 flattr: true
45 carrot: true
46 show_printlink: true
47 export_epub: true
48 export_mobi: true
49 export_pdf: true
50 export_csv: true
51 export_json: true
52 export_txt: true
53 export_xml: true
54 wallabag_url: http://v2.wallabag.org
55 wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
56
57 # pocket import
58 pocket_consumer_key: xxxxxxxx
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index c739f89b..a1535bc9 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -27,32 +27,6 @@ parameters:
27 # A secret key that's used to generate certain security-related tokens 27 # A secret key that's used to generate certain security-related tokens
28 secret: ThisTokenIsNotSoSecretChangeIt 28 secret: ThisTokenIsNotSoSecretChangeIt
29 29
30 # wallabag misc 30 # two factor stuff
31 app.version: 2.0.0-alpha
32 twofactor_auth: true 31 twofactor_auth: true
33 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
34
35 download_pictures: false # if true, pictures will be stored into data/assets for each article
36
37 # Entry view
38 share_twitter: true
39 share_mail: true
40 share_shaarli: true
41 shaarli_url: http://myshaarli.com
42 share_diaspora: true
43 diaspora_url: http://diasporapod.com
44 flattr: true
45 carrot: true
46 show_printlink: true
47 export_epub: true
48 export_mobi: true
49 export_pdf: true
50 export_csv: true
51 export_json: true
52 export_txt: true
53 export_xml: true
54 wallabag_url: http://v2.wallabag.org
55 wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
56
57 # pocket import
58 pocket_consumer_key: xxxxxxxx