From 3f5df9842d0e134c3779a5c4e169bed515216369 Mon Sep 17 00:00:00 2001 From: Josh Betz Date: Tue, 7 Feb 2017 12:51:30 -0600 Subject: [PATCH 1/2] Stop loading jetpack-force-2fa on all sites. We'll move it to shared-plugins so clients can use it if they want, but not required. --- .gitmodules | 3 --- jetpack-mandatory.php | 2 +- vip-jetpack.php | 6 ------ 3 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index cbf1f5f..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "jetpack-force-2fa"] - path = jetpack-force-2fa - url = git@github.com:Automattic/jetpack-force-2fa.git diff --git a/jetpack-mandatory.php b/jetpack-mandatory.php index a55cbbc..f2fc988 100644 --- a/jetpack-mandatory.php +++ b/jetpack-mandatory.php @@ -19,7 +19,7 @@ class WPCOM_VIP_Jetpack_Mandatory { protected $mandatory_modules = array( 'manage', 'monitor', - // 'sso', // Disabled while we roll out force-2fa + // 'sso', 'stats', 'vaultpress', ); diff --git a/vip-jetpack.php b/vip-jetpack.php index fc75f5c..212535f 100644 --- a/vip-jetpack.php +++ b/vip-jetpack.php @@ -25,9 +25,3 @@ return $modules; }, 999 ); - -/** - * Load Jetpack Force 2fa - */ -add_filter( 'jetpack_force_2fa_dependency_notice', '__return_false' ); -require_once( __DIR__ . '/jetpack-force-2fa/jetpack-force-2fa.php' ); From 7084212ff2fc74aed1830f1a5b8d9b8ddca17b0a Mon Sep 17 00:00:00 2001 From: Josh Betz Date: Wed, 8 Feb 2017 09:16:07 -0600 Subject: [PATCH 2/2] Remove jetpack-force-2fa --- jetpack-force-2fa | 1 - 1 file changed, 1 deletion(-) delete mode 160000 jetpack-force-2fa diff --git a/jetpack-force-2fa b/jetpack-force-2fa deleted file mode 160000 index ef7a7b8..0000000 --- a/jetpack-force-2fa +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ef7a7b8edb6550aea4c0e5f0f47ef06cdea9ce32