diff --git a/.env.example b/.env.example index 1939c905..34642590 100644 --- a/.env.example +++ b/.env.example @@ -50,5 +50,8 @@ MATOMO_SITE_ID= GOOGLE_RECAPTCHA_PUBLIC= GOOGLE_RECAPTCHA_PRIVATE= -# LDC Web API TOKEN -LDCWEB_API_TOKEN= \ No newline at end of file +# UWIL ADMIN SECURE +# - LIST SEPARATED WITH ',' (Required) +UWIL_ADMIN_SECURE_CIDR_LIST="" +# - LIST SEPARATED WITH ',' (Optional) +UWIL_ADMIN_SECURE_CIDR_PROJECT_ALLOWED_LIST="" diff --git a/composer.json b/composer.json index f71a83e3..724d8501 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "roots/wp-config": "1.0.0", "wpackagist-plugin/wordpress-seo": "^22.8", "wpengine/advanced-custom-fields-pro": "^6.2", - "uwil/admin-secure-wp": "^2.0", + "uwil/admin-secure-wp": "^3.0", "wpackagist-plugin/tinymce-advanced": "^5.9", "wpackagist-plugin/master-slider": "^3.9", "wpackagist-plugin/polylang": "^3.6", diff --git a/composer.lock b/composer.lock index ed905ca3..1340be3c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "657ed066c952a584be5613e50381ab89", + "content-hash": "092f5cfae77dde1f7d5058100280a3c8", "packages": [ { "name": "composer/installers", @@ -951,33 +951,33 @@ }, { "name": "uwil/admin-secure-wp", - "version": "2.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "git@lab.s-web.fr:ldc-web/projets/admin-secure-wp.git", - "reference": "e1fa99a4f10c2ee205714911f459da115b3034d0" + "reference": "0cceaac373f7506f4ea38c1ff4e3a1bbfe2db058" }, "dist": { "type": "zip", - "url": "https://lab.s-web.fr/api/v4/projects/101/packages/composer/archives/uwil/admin-secure-wp.zip?sha=e1fa99a4f10c2ee205714911f459da115b3034d0", - "reference": "e1fa99a4f10c2ee205714911f459da115b3034d0", + "url": "https://lab.s-web.fr/api/v4/projects/101/packages/composer/archives/uwil/admin-secure-wp.zip?sha=0cceaac373f7506f4ea38c1ff4e3a1bbfe2db058", + "reference": "0cceaac373f7506f4ea38c1ff4e3a1bbfe2db058", "shasum": "" }, "type": "wordpress-muplugin", - "description": "Sécurisation des BO via LDC Web." + "description": "Restrict access to LDC Network." }, { "name": "uwil/sbv-theme", - "version": "1.4.12", + "version": "1.4.13", "source": { "type": "git", "url": "git@lab.s-web.fr:ldc-web/projets/sbv-theme.git", - "reference": "6d23a97ca7c0311ed9bfc1e223393fd48b192eb8" + "reference": "141a74ac27d0f7480b5c1bec1f1e252ec1126e5e" }, "dist": { "type": "zip", - "url": "https://lab.s-web.fr/api/v4/projects/153/packages/composer/archives/uwil/sbv-theme.zip?sha=6d23a97ca7c0311ed9bfc1e223393fd48b192eb8", - "reference": "6d23a97ca7c0311ed9bfc1e223393fd48b192eb8", + "url": "https://lab.s-web.fr/api/v4/projects/153/packages/composer/archives/uwil/sbv-theme.zip?sha=141a74ac27d0f7480b5c1bec1f1e252ec1126e5e", + "reference": "141a74ac27d0f7480b5c1bec1f1e252ec1126e5e", "shasum": "" }, "type": "wordpress-theme", diff --git a/config/custom.php b/config/custom.php index d6ba368d..8820b6e4 100644 --- a/config/custom.php +++ b/config/custom.php @@ -53,6 +53,8 @@ Config::define('GOOGLE_RECAPTCHA_PUBLIC', env('GOOGLE_RECAPTCHA_PUBLIC')); Config::define('GOOGLE_RECAPTCHA_PRIVATE', env('GOOGLE_RECAPTCHA_PRIVATE')); /** - * LDC Web API TOKEN + * UWIL ADMIN SECURE */ -Config::define('LDCWEB_API_TOKEN', env('LDCWEB_API_TOKEN')); +Config::define('UWIL_ADMIN_SECURE_CIDR_LIST', env('UWIL_ADMIN_SECURE_CIDR_LIST', '')); +Config::define('UWIL_ADMIN_SECURE_CIDR_PROJECT_ALLOWED_LIST', env('UWIL_ADMIN_SECURE_CIDR_PROJECT_ALLOWED_LIST', '')); + diff --git a/manifest.yaml b/manifest.yaml index 1183b507..806abb76 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -36,9 +36,9 @@ data: CONTACT_MAIL_PAI: "${APP_CONTACT_MAIL_PAI}" CONTACT_MAIL_SAV: "${APP_CONTACT_MAIL_SAV}" MATOMO_SITE_ID: "${APP_MATOMO_SITE_ID}" - LDCWEB_API_TOKEN: "${APP_LDCWEB_API_TOKEN}" GOOGLE_RECAPTCHA_PUBLIC: "${APP_GOOGLE_RECAPTCHA_PUBLIC}" GOOGLE_RECAPTCHA_PRIVATE: "${APP_GOOGLE_RECAPTCHA_PRIVATE}" + UWIL_ADMIN_SECURE_CIDR_LIST: "${APP_GLOBAL_UWIL_ADMIN_SECURE_CIDR_LIST}" --- apiVersion: v1