summaryrefslogtreecommitdiff
path: root/doc/topics
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-13 18:09:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-13 18:09:39 +0000
commit00fa950a34b1c94617110b150b8b2517d5241249 (patch)
tree8f2d8683879079da8f520f7867ebd49b8beaadef /doc/topics
parentc36152ff8c41fad2f413f253eb7ac5c927e47c56 (diff)
downloadgitlab-ce-00fa950a34b1c94617110b150b8b2517d5241249.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics')
-rw-r--r--doc/topics/web_application_firewall/img/guide_waf_ingress_installation.pngbin54834 -> 0 bytes
-rw-r--r--doc/topics/web_application_firewall/img/guide_waf_ingress_installation_v12_9.pngbin0 -> 24830 bytes
-rw-r--r--doc/topics/web_application_firewall/img/guide_waf_ingress_save_changes_v12_9.pngbin0 -> 37120 bytes
-rw-r--r--doc/topics/web_application_firewall/quick_start_guide.md15
4 files changed, 2 insertions, 13 deletions
diff --git a/doc/topics/web_application_firewall/img/guide_waf_ingress_installation.png b/doc/topics/web_application_firewall/img/guide_waf_ingress_installation.png
deleted file mode 100644
index a150fa4e46f..00000000000
--- a/doc/topics/web_application_firewall/img/guide_waf_ingress_installation.png
+++ /dev/null
Binary files differ
diff --git a/doc/topics/web_application_firewall/img/guide_waf_ingress_installation_v12_9.png b/doc/topics/web_application_firewall/img/guide_waf_ingress_installation_v12_9.png
new file mode 100644
index 00000000000..5c4718b0487
--- /dev/null
+++ b/doc/topics/web_application_firewall/img/guide_waf_ingress_installation_v12_9.png
Binary files differ
diff --git a/doc/topics/web_application_firewall/img/guide_waf_ingress_save_changes_v12_9.png b/doc/topics/web_application_firewall/img/guide_waf_ingress_save_changes_v12_9.png
new file mode 100644
index 00000000000..df1223f12ec
--- /dev/null
+++ b/doc/topics/web_application_firewall/img/guide_waf_ingress_save_changes_v12_9.png
Binary files differ
diff --git a/doc/topics/web_application_firewall/quick_start_guide.md b/doc/topics/web_application_firewall/quick_start_guide.md
index 5942a5ac996..417e1973b87 100644
--- a/doc/topics/web_application_firewall/quick_start_guide.md
+++ b/doc/topics/web_application_firewall/quick_start_guide.md
@@ -14,16 +14,6 @@ need to ensure your own [Runners are configured](../../ci/runners/README.md) and
**Note**: GitLab's Web Application Firewall is deployed with [Ingress](../../user/clusters/applications.md#Ingress),
so it will be available to your applications no matter how you deploy them to Kubernetes.
-## Enable or disable ModSecurity
-
-ModSecurity is enabled by default on GitLab.com. You can toggle the feature flag to false by running the following command in the Rails console:
-
-```ruby
-Feature.disable(:ingress_modsecurity)
-```
-
-Once disabled, you must uninstall and reinstall your Ingress application for the changes to take effect. See the [Feature Flag](../../user/project/operations/feature_flags.md) documentation for more information.
-
## Configuring your Google account
Before creating and connecting your Kubernetes cluster to your GitLab project,
@@ -112,10 +102,9 @@ Once it is installed, the other applications that rely on it will each have thei
For this guide, we need to install Ingress. Ingress provides load balancing,
SSL termination, and name-based virtual hosting, using NGINX behind
-the scenes. Make sure that the **Enable Web Application Firewall** button is checked
-before installing.
+the scenes. Make sure to switch the toogle to the enabled position before installing.
-![Cluster applications](./img/guide_waf_ingress_installation.png)
+![Cluster applications](./img/guide_waf_ingress_installation_v12_9.png)
After Ingress is installed, wait a few seconds and copy the IP address that
is displayed in order to add in your base **Domain** at the top of the page. For