From 006df40e1672f1366a08b734973f1aa71a0a28f6 Mon Sep 17 00:00:00 2001 From: Miguel Rodriguez Date: Mon, 12 Jan 2015 12:46:48 +0100 Subject: [PATCH 1/2] Adding roxy property to ignore certain files or folders --- deploy/default.properties | 3 +++ deploy/lib/server_config.rb | 2 ++ 2 files changed, 5 insertions(+) diff --git a/deploy/default.properties b/deploy/default.properties index f508e9e6..8f48cc56 100644 --- a/deploy/default.properties +++ b/deploy/default.properties @@ -204,3 +204,6 @@ mlcp-vmargs=-Xmx512m # Temporary fix to support MarkLogic 8 EA2 # evaler-port=7998 + +# folde to ignore when deploying into modules database +ignore-folders=.*/src/(node_modules|.tmp)/.* diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb index b295d308..51e3fedb 100644 --- a/deploy/lib/server_config.rb +++ b/deploy/lib/server_config.rb @@ -1130,12 +1130,14 @@ def deploy_src load_html_as_xml = @properties['ml.load-html-as-xml'] load_js_as_binary = @properties['ml.load-js-as-binary'] load_css_as_binary = @properties['ml.load-css-as-binary'] + folders_to_ignore = @properties['ml.ignore-folders'] modules_databases.each do |dest_db| ignore_us = [] ignore_us << "^#{test_dir}.*$" unless test_dir.blank? || deploy_tests?(dest_db) ignore_us << "^#{app_config_file}$" ignore_us << "^#{test_config_file}$" + ignore_us << "^#{folders_to_ignore}$" src_permissions = permissions(@properties['ml.app-role'], Roxy::ContentCapability::ER) From c7b977cb4303f8e7a10de6e081faa0e0e94337aa Mon Sep 17 00:00:00 2001 From: Miguel Rodriguez Date: Mon, 12 Jan 2015 12:46:48 +0100 Subject: [PATCH 2/2] Adding roxy property to ignore certain files or folders --- deploy/default.properties | 1 + deploy/lib/server_config.rb | 2 ++ deploy/sample/build.sample.properties | 3 +++ 3 files changed, 6 insertions(+) diff --git a/deploy/default.properties b/deploy/default.properties index f508e9e6..b08703fe 100644 --- a/deploy/default.properties +++ b/deploy/default.properties @@ -204,3 +204,4 @@ mlcp-vmargs=-Xmx512m # Temporary fix to support MarkLogic 8 EA2 # evaler-port=7998 + diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb index b295d308..6aa09cc5 100644 --- a/deploy/lib/server_config.rb +++ b/deploy/lib/server_config.rb @@ -1130,12 +1130,14 @@ def deploy_src load_html_as_xml = @properties['ml.load-html-as-xml'] load_js_as_binary = @properties['ml.load-js-as-binary'] load_css_as_binary = @properties['ml.load-css-as-binary'] + folders_to_ignore = @properties['ml.ignore-folders'] modules_databases.each do |dest_db| ignore_us = [] ignore_us << "^#{test_dir}.*$" unless test_dir.blank? || deploy_tests?(dest_db) ignore_us << "^#{app_config_file}$" ignore_us << "^#{test_config_file}$" + ignore_us << "^#{folders_to_ignore}$" unless folders_to_ignore.blank? src_permissions = permissions(@properties['ml.app-role'], Roxy::ContentCapability::ER) diff --git a/deploy/sample/build.sample.properties b/deploy/sample/build.sample.properties index e0970f2a..cf411b37 100644 --- a/deploy/sample/build.sample.properties +++ b/deploy/sample/build.sample.properties @@ -154,3 +154,6 @@ local-server=localhost # mlcp-home=/usr/local/mlcp mlcp-vmargs=-Xmx512m + +# folder to ignore when deploying into modules database +# ignore-folders=.*/src/(node_modules|.tmp)/.*