fixing whitespace issue and repo

Author: csanders-git

crs-setup.conf.example

@@ -645,7 +645,7 @@ SecDefaultAction "phase:2,log,auditlog,pass"
 #
 # Blocking based on reputation is permanent in the CRS. Unlike other rules,
 # which look at the indvidual request, the blocking of IPs is based on
-# a persistent record in the IP collection, which remains active for a 
+# a persistent record in the IP collection, which remains active for a
 # certain amount of time.
 #
 # There are two ways an individual client can become flagged for blocking:

util/Dockerfile

@@ -1,4 +1,4 @@
-FROM owasp/modsecurity:latest
+FROM owasp/modsecurity:v2_master
 MAINTAINER Chaim Sanders [email protected]
 
 ENV PARANOIA=1
@@ -8,10 +8,13 @@ RUN dnf -y update
 RUN dnf -y install python
 
 RUN cd /opt && \
-  wget https://github.com/SpiderLabs/owasp-modsecurity-crs/archive/v3.0.2.tar.gz && \
-  tar -xvzf v3.0.2.tar.gz && \
+  #wget https://github.com/SpiderLabs/owasp-modsecurity-crs/archive/v3.0.2.tar.gz && \
+  #tar -xvzf v3.0.2.tar.gz && \
+  git clone https://github.com/csanders-git/owasp-modsecurity-crs owasp-modsecurity-crs-3.0.2 && \
   cp -R /opt/owasp-modsecurity-crs-3.0.2/ /etc/httpd/modsecurity.d/owasp-crs/ && \
   mv /etc/httpd/modsecurity.d/owasp-crs/crs-setup.conf.example /etc/httpd/modsecurity.d/owasp-crs/crs-setup.conf && \
+  cd /etc/httpd/modsecurity.d/owasp-crs/ && \
+  git checkout v3.0/dev-za && \
   cd /etc/httpd/modsecurity.d && \
   printf "include modsecurity.d/owasp-crs/crs-setup.conf\ninclude modsecurity.d/owasp-crs/rules/*.conf" > include.conf && \
   sed -i -e 's/SecRuleEngine DetectionOnly/SecRuleEngine On/g' /etc/httpd/modsecurity.d/modsecurity.conf