From 7e1a611847f243d757b204605a72595eb7ffe2c5 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 11 Jul 2017 17:19:33 +0200
Subject: [PATCH] Updates and replace mollom with recaptcha
---
composer.json | 14 ++++++------
...ha_point.contact_message_feedback_form.yml | 9 ++++++++
...ha_point.contact_message_personal_form.yml | 9 ++++++++
...aptcha.captcha_point.node_article_form.yml | 7 ++++++
.../captcha.captcha_point.node_page_form.yml | 7 ++++++
.../captcha.captcha_point.user_login_form.yml | 9 ++++++++
.../sync/captcha.captcha_point.user_pass.yml | 9 ++++++++
...ptcha.captcha_point.user_register_form.yml | 9 ++++++++
config/default/sync/captcha.settings.yml | 11 ++++++++++
config/default/sync/core.extension.yml | 5 ++---
.../sync/metatag.metatag_defaults.front.yml | 3 ++-
config/default/sync/mollom.settings.yml | 22 -------------------
config/default/sync/recaptcha.settings.yml | 10 +++++++++
...action.mollom_comment_unpublish_action.yml | 13 -----------
...em.action.mollom_node_unpublish_action.yml | 13 -----------
15 files changed, 91 insertions(+), 59 deletions(-)
create mode 100644 config/default/sync/captcha.captcha_point.contact_message_feedback_form.yml
create mode 100644 config/default/sync/captcha.captcha_point.contact_message_personal_form.yml
create mode 100644 config/default/sync/captcha.captcha_point.node_article_form.yml
create mode 100644 config/default/sync/captcha.captcha_point.node_page_form.yml
create mode 100644 config/default/sync/captcha.captcha_point.user_login_form.yml
create mode 100644 config/default/sync/captcha.captcha_point.user_pass.yml
create mode 100644 config/default/sync/captcha.captcha_point.user_register_form.yml
create mode 100644 config/default/sync/captcha.settings.yml
delete mode 100644 config/default/sync/mollom.settings.yml
create mode 100644 config/default/sync/recaptcha.settings.yml
delete mode 100644 config/default/sync/system.action.mollom_comment_unpublish_action.yml
delete mode 100644 config/default/sync/system.action.mollom_node_unpublish_action.yml
diff --git a/composer.json b/composer.json
index 6a29c08..3a80677 100644
--- a/composer.json
+++ b/composer.json
@@ -84,8 +84,8 @@
"drupal/contact_storage": "1.x-dev",
"drupal/context": "1.x-dev",
"drupal/context_active_trail": "1.x-dev",
- "drupal/core": "8.3.0",
- "drupal/ctools": "3.0-beta1",
+ "drupal/core": "8.3.5",
+ "drupal/ctools": "3.0",
"drupal/diff": "1.0-beta2",
"drupal/draggableviews": "1.0",
"drupal/drd_agent": "~3.0",
@@ -95,18 +95,18 @@
"drupal/extlink": "1.0",
"drupal/faq": "1.x-dev",
"drupal/field_group": "1.x-dev",
- "drupal/honeypot": "1.24",
+ "drupal/honeypot": "1.26",
"drupal/linkit": "^5.0",
"drupal/maillog": "1.x-dev",
- "drupal/metatag": "1.0",
- "drupal/mollom": "^1.2",
+ "drupal/metatag": "1.1",
"drupal/navbar_filter": "^1.1",
"drupal/node_view_permissions": "1.0",
"drupal/onomasticon": "1.0",
- "drupal/pathauto": "1.0-rc1",
+ "drupal/pathauto": "1.0",
"drupal/piwik": "1.1",
"drupal/piwik_noscript": "^1.0",
"drupal/queue_ui": "2.x-dev",
+ "drupal/recaptcha": "^2.2",
"drupal/redis": "1.x-dev",
"drupal/rules": "3.0-alpha2",
"drupal/simplenews": "1.x-dev",
@@ -117,7 +117,7 @@
"drupal/stage_file_proxy": "1.x-dev",
"drupal/subpathauto": "1.0-beta1",
"drupal/tagclouds": "1.x-dev",
- "drupal/token": "1.0-rc1",
+ "drupal/token": "1.0",
"drupal/twitter": "1.x-dev",
"drupal/unlimited_number": "1.0.0-beta1",
"drupal/video": "1.2",
diff --git a/config/default/sync/captcha.captcha_point.contact_message_feedback_form.yml b/config/default/sync/captcha.captcha_point.contact_message_feedback_form.yml
new file mode 100644
index 0000000..7171b49
--- /dev/null
+++ b/config/default/sync/captcha.captcha_point.contact_message_feedback_form.yml
@@ -0,0 +1,9 @@
+uuid: 8ff9379c-b3b0-489f-a1d6-746f0f53685c
+langcode: en
+status: true
+dependencies: { }
+_core:
+ default_config_hash: MbTbUeeaumH8DjENUwT0-8uW9UuxyNHbF6jbKCLhYkk
+formId: contact_message_feedback_form
+captchaType: default
+label: null
diff --git a/config/default/sync/captcha.captcha_point.contact_message_personal_form.yml b/config/default/sync/captcha.captcha_point.contact_message_personal_form.yml
new file mode 100644
index 0000000..cda7d82
--- /dev/null
+++ b/config/default/sync/captcha.captcha_point.contact_message_personal_form.yml
@@ -0,0 +1,9 @@
+uuid: 8b21ee1f-7ee5-43cb-ab93-94a92da25e32
+langcode: en
+status: true
+dependencies: { }
+_core:
+ default_config_hash: JWbmGm_KvY_3No38GsmOrkAy8N9u5Sm4yjJlDJlAW7c
+formId: contact_message_personal_form
+captchaType: default
+label: null
diff --git a/config/default/sync/captcha.captcha_point.node_article_form.yml b/config/default/sync/captcha.captcha_point.node_article_form.yml
new file mode 100644
index 0000000..d304206
--- /dev/null
+++ b/config/default/sync/captcha.captcha_point.node_article_form.yml
@@ -0,0 +1,7 @@
+uuid: fb390cc5-7ee3-4402-812d-beef328c6e8c
+langcode: en
+status: false
+dependencies: { }
+formId: node_article_form
+captchaType: default
+label: null
diff --git a/config/default/sync/captcha.captcha_point.node_page_form.yml b/config/default/sync/captcha.captcha_point.node_page_form.yml
new file mode 100644
index 0000000..4ea415f
--- /dev/null
+++ b/config/default/sync/captcha.captcha_point.node_page_form.yml
@@ -0,0 +1,7 @@
+uuid: b121574b-637d-4a6f-98f0-03eb65c45a8d
+langcode: en
+status: false
+dependencies: { }
+formId: node_page_form
+captchaType: default
+label: null
diff --git a/config/default/sync/captcha.captcha_point.user_login_form.yml b/config/default/sync/captcha.captcha_point.user_login_form.yml
new file mode 100644
index 0000000..73ba1be
--- /dev/null
+++ b/config/default/sync/captcha.captcha_point.user_login_form.yml
@@ -0,0 +1,9 @@
+uuid: 108a0ef6-1d33-4e8f-bba0-8512ba5788b8
+langcode: en
+status: false
+dependencies: { }
+_core:
+ default_config_hash: crLwyc9uwZ8Bv8lpMLIOEQYHOxW_mS49jaDf_95-o4I
+formId: user_login_form
+captchaType: default
+label: null
diff --git a/config/default/sync/captcha.captcha_point.user_pass.yml b/config/default/sync/captcha.captcha_point.user_pass.yml
new file mode 100644
index 0000000..c0c2208
--- /dev/null
+++ b/config/default/sync/captcha.captcha_point.user_pass.yml
@@ -0,0 +1,9 @@
+uuid: e62f9cc5-ff0c-4a20-8208-ffa4f1a4de63
+langcode: en
+status: true
+dependencies: { }
+_core:
+ default_config_hash: KV2eyuDk4Ux0da6fu6QsTUf_49rPDXilNurV5nRZqJE
+formId: user_pass
+captchaType: default
+label: null
diff --git a/config/default/sync/captcha.captcha_point.user_register_form.yml b/config/default/sync/captcha.captcha_point.user_register_form.yml
new file mode 100644
index 0000000..ed21983
--- /dev/null
+++ b/config/default/sync/captcha.captcha_point.user_register_form.yml
@@ -0,0 +1,9 @@
+uuid: 6d687785-9a8b-4aa7-858f-0de44066fb69
+langcode: en
+status: true
+dependencies: { }
+_core:
+ default_config_hash: O11nB9Assnic6AhIuaeK_CQdh_zO0udxABDnUZJupis
+formId: user_register_form
+captchaType: default
+label: null
diff --git a/config/default/sync/captcha.settings.yml b/config/default/sync/captcha.settings.yml
new file mode 100644
index 0000000..88764e2
--- /dev/null
+++ b/config/default/sync/captcha.settings.yml
@@ -0,0 +1,11 @@
+default_challenge: recaptcha/reCAPTCHA
+description: 'This question is for testing whether or not you are a human visitor and to prevent automated spam submissions.'
+administration_mode: false
+allow_on_admin_pages: false
+add_captcha_description: true
+default_validation: 1
+persistence: 1
+enable_stats: true
+log_wrong_responses: false
+_core:
+ default_config_hash: pfrv6lPS72f5WG1UB4wHkgQV2invlHwVpaCy_mY-ClQ
diff --git a/config/default/sync/core.extension.yml b/config/default/sync/core.extension.yml
index 2642d61..962eb51 100644
--- a/config/default/sync/core.extension.yml
+++ b/config/default/sync/core.extension.yml
@@ -6,8 +6,8 @@ module:
block: 0
block_class: 0
block_content: 0
- block_place: 0
breakpoint: 0
+ captcha: 0
chosen: 0
chosen_lib: 0
ckeditor: 0
@@ -35,13 +35,12 @@ module:
linkit: 0
menu_ui: 0
metatag: 0
- mollom: 0
navbar_filter: 0
node: 0
options: 0
- outside_in: 0
path: 0
rdf: 0
+ recaptcha: 0
redis: 0
search: 0
shortcut: 0
diff --git a/config/default/sync/metatag.metatag_defaults.front.yml b/config/default/sync/metatag.metatag_defaults.front.yml
index b05f3e8..dd60ed4 100644
--- a/config/default/sync/metatag.metatag_defaults.front.yml
+++ b/config/default/sync/metatag.metatag_defaults.front.yml
@@ -7,5 +7,6 @@ _core:
id: front
label: 'Front page'
tags:
- canonical_url: '[site:url]'
shortlink: '[site:url]'
+ canonical_url: '[site:url]'
+ title: '[site:name]'
diff --git a/config/default/sync/mollom.settings.yml b/config/default/sync/mollom.settings.yml
deleted file mode 100644
index 28ff624..0000000
--- a/config/default/sync/mollom.settings.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-keys:
- public: ''
- private: ''
-fallback: 1
-languages_expected: { }
-test_mode:
- enabled: false
- api_endpoint: dev.mollom.com
- keys:
- public: ''
- private: ''
- invalid:
- api_endpoint: fake-host
-privacy_link: true
-log_level: 4
-connection_timeout_seconds: 3
-api_endpoint: rest.mollom.com
-captcha:
- audio:
- enabled: true
-_core:
- default_config_hash: 8uHhdqIc3ARJWLcZ_gKimtOymT0SRxGryuDcC6S5Vx4
diff --git a/config/default/sync/recaptcha.settings.yml b/config/default/sync/recaptcha.settings.yml
new file mode 100644
index 0000000..0e00d14
--- /dev/null
+++ b/config/default/sync/recaptcha.settings.yml
@@ -0,0 +1,10 @@
+site_key: ''
+secret_key: ''
+widget:
+ theme: light
+ type: image
+ size: ''
+ tabindex: 0
+ noscript: false
+_core:
+ default_config_hash: ZKQ03ePk4sH2zESRw4tdZYw__nG2YN4Ru5roPL23g3A
diff --git a/config/default/sync/system.action.mollom_comment_unpublish_action.yml b/config/default/sync/system.action.mollom_comment_unpublish_action.yml
deleted file mode 100644
index 56217d9..0000000
--- a/config/default/sync/system.action.mollom_comment_unpublish_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 7111fe02-fff6-4cdf-9874-ca822f1a7f41
-langcode: en
-status: true
-dependencies:
- module:
- - mollom
-_core:
- default_config_hash: j6Ue7cqKs-sJx6vtFshGtwfixoAwoWjy0p5LjdzYd-s
-id: mollom_comment_unpublish_action
-label: 'Report to Mollom and unpublish'
-type: comment
-plugin: mollom_comment_unpublish_action
-configuration: { }
diff --git a/config/default/sync/system.action.mollom_node_unpublish_action.yml b/config/default/sync/system.action.mollom_node_unpublish_action.yml
deleted file mode 100644
index 4f72367..0000000
--- a/config/default/sync/system.action.mollom_node_unpublish_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: d5314767-deb6-4b4a-85dd-d295c4a800c8
-langcode: en
-status: true
-dependencies:
- module:
- - mollom
-_core:
- default_config_hash: HX1_9T0mpGfkV9UbmnA3z7YJ3iO1WEHYD2u4pxiTnvg
-id: mollom_node_unpublish_action
-label: 'Report to Mollom and unpublish'
-type: node
-plugin: mollom_node_unpublish_action
-configuration: { }
--
GitLab