-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
wallabag: update wallabag to 2.3.8 and various fixes (#4179)
Fixes #3113 Satisfy new password requirements with validation Fix "invalid" domain_name Fix wizard and domain_name
- Loading branch information
1 parent
a0e3d3b
commit 272d8b6
Showing
7 changed files
with
133 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| wallabag-2.2.3.tar.gz SHA1 496e6c7d980c078e42d3bab7b0e978bd0af02b96 | ||
| wallabag-2.2.3.tar.gz SHA256 13fe5cb7cfc741abee08312f0055e9549e60590daff2fac41be5266f7956d857 | ||
| wallabag-2.2.3.tar.gz MD5 63f4cc85397fd6db3e0e3d5f3fa11e02 | ||
| wallabag-2.3.8.tar.gz SHA1 0a925de3170b8817fb556f82226bd7c7c3c5aabe | ||
| wallabag-2.3.8.tar.gz SHA256 58f319ee41828fcc4fd00a14c4ac7c16b2179a47af21e257a15938311d1426eb | ||
| wallabag-2.3.8.tar.gz MD5 b5f61f50aad1c60d34ad3a3b8848b29c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,64 @@ | ||
| parameters: | ||
| database_driver: pdo_mysql | ||
| database_driver_class: ~ | ||
| database_host: 127.0.0.1 | ||
| database_port: 3306 | ||
| database_name: @database_name@ | ||
| database_user: wallabag | ||
| database_password: @database_password@ | ||
| # For SQLite, database_path should be "%kernel.project_dir%/data/db/wallabag.sqlite" | ||
| database_path: null | ||
| database_table_prefix: wallabag_ | ||
| database_socket: null | ||
| # with PostgreSQL and SQLite, you must set "utf8" | ||
| database_charset: utf8mb4 | ||
| mailer_transport: smtp | ||
| mailer_host: 127.0.0.1 | ||
| mailer_user: null | ||
| mailer_password: null | ||
|
|
||
| domain_name: @protocoll_and_domain_name@ | ||
|
|
||
| mailer_transport: smtp | ||
| mailer_user: ~ | ||
| mailer_password: ~ | ||
| mailer_host: 127.0.0.1 | ||
| mailer_port: false | ||
| mailer_encryption: ~ | ||
| mailer_auth_mode: ~ | ||
|
|
||
| locale: en | ||
|
|
||
| # A secret key that's used to generate certain security-related tokens | ||
| secret: @wallabag_secret@ | ||
|
|
||
| locale: en | ||
|
|
||
| # two factor stuff | ||
| twofactor_auth: false | ||
| twofactor_sender: no-reply@wallabag.org | ||
| fosuser_registration: true | ||
|
|
||
| # fosuser stuff | ||
| fosuser_registration: false | ||
| fosuser_confirmation: false | ||
|
|
||
| # how long the access token should live in seconds for the API | ||
| fos_oauth_server_access_token_lifetime: 3600 | ||
| # how long the refresh token should life in seconds for the API | ||
| fos_oauth_server_refresh_token_lifetime: 1209600 | ||
|
|
||
| from_email: no-reply@wallabag.org | ||
|
|
||
| rss_limit: 50 | ||
| # RabbitMQ processing | ||
| rabbitmq_host: localhost | ||
| rabbitmq_port: 5672 | ||
| rabbitmq_user: guest | ||
| rabbitmq_password: guest | ||
| rabbitmq_prefetch_count: 10 | ||
|
|
||
| # Redis processing | ||
| redis_scheme: tcp | ||
| redis_host: localhost | ||
| redis_port: 6379 | ||
| redis_path: null | ||
| redis_password: null | ||
| sites_credentials: { } | ||
|
|
||
| # sentry logging | ||
| sentry_dsn: ~ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,62 @@ | ||
| [ | ||
| { | ||
| "step_title":"Wallabag database configuration", | ||
| "items":[ | ||
| { | ||
| "type":"password", | ||
| "desc":"Enter your MySQL password.", | ||
| "subitems":[ | ||
| { | ||
| "key":"wizard_mysql_password_root", | ||
| "desc":"Root password", | ||
| "validator":{ | ||
| "allowBlank":false | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type":"password", | ||
| "desc":"A 'wallabag' MySQL user and database will be created. Please enter a password for the 'wallabag' user.", | ||
| "subitems":[ | ||
| { | ||
| "key":"wizard_mysql_database_password", | ||
| "desc":"User password", | ||
| "validator":{ | ||
| "allowBlank":false | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, { | ||
| { | ||
| "step_title": "Wallabag database configuration", | ||
| "items": [ | ||
| { | ||
| "type": "password", | ||
| "desc": "Enter your MySQL password.", | ||
| "subitems": [ | ||
| { | ||
| "key": "wizard_mysql_password_root", | ||
| "desc": "Root password", | ||
| "validator": { | ||
| "allowBlank": false | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "password", | ||
| "desc": "A 'wallabag' MySQL user and database will be created. Please enter a password for the 'wallabag' user.", | ||
| "subitems": [ | ||
| { | ||
| "key": "wizard_mysql_database_password", | ||
| "desc": "User password", | ||
| "validator": { | ||
| "allowBlank": false, | ||
| "regex": { | ||
| "expr": "/^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[!@#$%^&*?{}()\\[\\]\\-=_+\\;'\":<>/,.])[A-Za-z\\d!@#$%^&*?{}()\\[\\]\\-=_+\\;'\":<>/,.]{10,}$/", | ||
| "errorText": "Minimal password length 10, Include mixed case, Include numeric characters, Include special characters, Exclude common password, Exclude name of user from password" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "step_title": "First login", | ||
| "items": [{ | ||
| "items": [ | ||
| { | ||
| "desc": "The default credentials for the web interface is wallabag:wallabag. Change it on 'User Management' page." | ||
| }] | ||
| } | ||
| }, | ||
| { | ||
| "type": "textfield", | ||
| "desc": "Enter your NAS domain name or IP address. e.g https://192.168.0.2", | ||
| "subitems": [ | ||
| { | ||
| "key": "wizard_protocoll_and_domain_name", | ||
| "desc": "Protocol and Domain Name", | ||
| "validator": { | ||
| "allowBlank": false, | ||
| "regex": { | ||
| "expr": "/http(s)?\\:\\/\\/.+\\..+/i", | ||
| "errorText": "Must be a valid URL" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] |