fix: detect-viruses config replace long string to list

viasite-ansible · Jul 13, 2017 · d7cac11 · d7cac11
1 parent 96ffa45
commit d7cac11
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -38,9 +38,10 @@ server_scripts_detect_viruses_php_signatures:
   - '\.chr(101'
   - 'b374k'
   - "'base'\\.(32\\*"
-server_scripts_detect_viruses_php_signatures_excluded: "filesManag"
-server_scripts_detect_viruses_php_files_excluded: 'easy-captcha.php\|tfpdf.php'
-server_scripts_detect_viruses_js_signatures: "document.write(unescape"
+server_scripts_detect_viruses_php_signatures_excluded: []
+server_scripts_detect_viruses_php_files_excluded: []
+server_scripts_detect_viruses_js_signatures:
+  - "document.write(unescape"
 
 server_scripts_drupal_build_archives_projects_root: /usr/local/drupal
 server_scripts_drupal_build_archives_build_root: "{{ server_scripts_drupal_build_archives_projects_root }}/build"

diff --git a/templates/server-scripts.conf.j2 b/templates/server-scripts.conf.j2
@@ -36,9 +36,9 @@ DOMAINS_CHECK_ASSERT_IP="{{ server_scripts_domains_assert_ip }}"
 # detect-viruses
 VIRUSES_LOG="{{ server_scripts_detect_viruses_log }}"
 VIRUSES_PHP_SIGNATURES="{{ server_scripts_detect_viruses_php_signatures | join('\|') }}"
-VIRUSES_PHP_SIGNATURES_EXCLUDED="{{ server_scripts_detect_viruses_php_signatures_excluded }}"
-VIRUSES_PHP_FILES_EXCLUDED="{{ server_scripts_detect_viruses_php_files_excluded }}"
-VIRUSES_JS_SIGNATURES="{{ server_scripts_detect_viruses_js_signatures }}"
+VIRUSES_PHP_SIGNATURES_EXCLUDED="{{ server_scripts_detect_viruses_php_signatures_excluded | join('\|') }}"
+VIRUSES_PHP_FILES_EXCLUDED="{{ server_scripts_detect_viruses_php_files_excluded | join('\|') }}"
+VIRUSES_JS_SIGNATURES="{{ server_scripts_detect_viruses_js_signatures | join('\|') }}"
 
 # drupal-build-archives
 DRUPAL_PROJECTS_ROOT="{{ server_scripts_drupal_build_archives_projects_root }}"