general improvements

AlfrescoLabs · Feb 17, 2017 · 14231db · 14231db
1 parent 6ec53d9
commit 14231db
Show file tree

Hide file tree

Showing 5 changed files with 148 additions and 51 deletions.
diff --git a/.kitchen.docker.yml b/.kitchen.docker.yml
@@ -1,30 +1,27 @@
 # When editing this file, remember that http://www.yamllint.com is your friend :-)
 ---
+
 driver:
-  name: docker
-  use_sudo: false
+  name: vagrant
+  customize:
+    memory: 4096
+    cpus: 2
 
 provisioner:
   name: chef_zero
 
-
 verifier:
   name: inspec
 
 platforms:
-  - name: centos-7
+  - name: centos-7.2
     driver_config:
-      image: centos:7
-      platform: centos
-      run_command: /usr/sbin/init
-      privileged: true
-      forward:
-      - 80:80
-      - 8070:8070
-      - 8081:8081
-      - 8090:8090
-      - 9001:9001
-      - 9000:9000
+      network:
+      - ["private_network", {ip: "192.168.33.23"}]
+
+    driver:
+      box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.2_chef-provisionerless.box
+
 
 suites:
   - name: community-edition
@@ -69,6 +66,27 @@ suites:
         "use_nossl_config" : true
       }
      }
+  - name: community-solr6-52
+    run_list:
+      - recipe[alfresco::default]
+      - recipe[alfresco::redeploy]
+    verifier:
+      inspec_tests:
+        - name: nginx-hardening
+          git: https://github.com/Alfresco/tests-nginx-hardening
+    data_bags_path: "test/integration/data_bags"
+    attributes: {
+      "name": "chef-alfresco-community-52",
+      "hostname": "alfresco-allinone-test",
+      "alfresco" : {
+        "components" : ['haproxy','nginx','tomcat','transform','repo','share','solr6','mysql','googledocs','yourkit'],
+        "version" : "5.2.d",
+        "ssl_enabled" : false
+      },
+      "nginx" : {
+        "use_nossl_config" : true
+      }
+     }
   - name: enterprise-edition
     run_list:
       - recipe[alfresco::default]
@@ -83,7 +101,7 @@ suites:
       "hostname": "alfresco-allinone-test",
       "alfresco" : {
         "version" : "5.1.2",
-        "components" : ["haproxy","nginx","tomcat","transform","repo","share","solr","mysql","aos", "rm",'googledocs','yourkit'],
+        "components" : ["haproxy","nginx","tomcat","transform","repo","share","solr","mysql","aos", "rm"],
         "edition" : "enterprise",
         "ssl_enabled" : false
       },
@@ -96,7 +114,7 @@ suites:
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             },
-            "staging" : {
+            "internal-staging" : {
               "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-staging",
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
@@ -135,7 +153,7 @@ suites:
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             },
-            "staging" : {
+            "internal-staging" : {
               "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-staging",
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
@@ -145,15 +163,10 @@ suites:
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             },
-            "alfresco-internal-staging" : {
+            "staging" : {
               "url" : "https://artifacts.alfresco.com/nexus/content/groups/staging",
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
-            },
-            "alfresco-staging-platform" : {
-              "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-staging",
-              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
-              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             }
           }
         }
@@ -189,7 +202,7 @@ suites:
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             },
-            "staging" : {
+            "internal-staging" : {
               "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-staging",
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
@@ -199,15 +212,10 @@ suites:
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             },
-            "alfresco-internal-staging" : {
+            "staging" : {
               "url" : "https://artifacts.alfresco.com/nexus/content/groups/staging",
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
-            },
-            "alfresco-staging-platform" : {
-              "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-staging",
-              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
-              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             }
           }
         }

diff --git a/.kitchen.yml b/.kitchen.yml
@@ -114,7 +114,7 @@ suites:
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             },
-            "staging" : {
+            "internal-staging" : {
               "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-staging",
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
@@ -153,7 +153,7 @@ suites:
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             },
-            "staging" : {
+            "internal-staging" : {
               "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-staging",
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
@@ -163,15 +163,59 @@ suites:
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             },
-            "alfresco-internal-staging" : {
+            "staging" : {
               "url" : "https://artifacts.alfresco.com/nexus/content/groups/staging",
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
+            }
+          }
+        }
+      },
+      "nginx" : {
+        "use_nossl_config" : true
+      }
+     }
+  - name: enterprise-solr6-52
+    run_list:
+      - recipe[alfresco::default]
+      - recipe[alfresco::redeploy]
+    data_bags_path: "test/integration/data_bags"
+    verifier:
+      inspec_tests:
+        - name: nginx-hardening
+          git: https://github.com/Alfresco/tests-nginx-hardening
+    attributes: {
+      "name": "chef-alfresco-enterprise-52",
+      "hostname": "alfresco-allinone-test",
+      "alfresco" : {
+        "version" : "5.2.0",
+        "components" : ["haproxy","nginx","tomcat","transform","repo","share","solr6","mysql","aos","rm"],
+        "edition" : "enterprise",
+        "ssl_enabled" : false
+      },
+      "artifact-deployer" : {
+        "maven" : {
+          "timeout" : 1500,
+          "repositories" : {
+            "internal" : {
+              "url" : "https://artifacts.alfresco.com/nexus/content/groups/internal",
+              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
+              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             },
-            "alfresco-staging-platform" : {
+            "internal-staging" : {
               "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-staging",
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
+            },
+            "internal-releases" : {
+              "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-releases",
+              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
+              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
+            },
+            "staging" : {
+              "url" : "https://artifacts.alfresco.com/nexus/content/groups/staging",
+              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
+              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             }
           }
         }
@@ -180,7 +224,7 @@ suites:
         "use_nossl_config" : true
       }
      }
-  - name: enterprise-solr6-52
+  - name: enterprise-52
     run_list:
       - recipe[alfresco::default]
       - recipe[alfresco::redeploy]
@@ -194,7 +238,7 @@ suites:
       "hostname": "alfresco-allinone-test",
       "alfresco" : {
         "version" : "5.2.0",
-        "components" : ["haproxy","nginx","tomcat","transform","repo","share","solr6","mysql","aos","rm"],
+        "components" : ["haproxy","nginx","tomcat","transform","repo","share","solr","mysql","aos","rm"],
         "edition" : "enterprise",
         "ssl_enabled" : false
       },
@@ -207,7 +251,7 @@ suites:
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             },
-            "staging" : {
+            "internal-staging" : {
               "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-staging",
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
@@ -217,15 +261,59 @@ suites:
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             },
-            "alfresco-internal-staging" : {
+            "staging" : {
               "url" : "https://artifacts.alfresco.com/nexus/content/groups/staging",
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
+            }
+          }
+        }
+      },
+      "nginx" : {
+        "use_nossl_config" : true
+      }
+     }
+  - name: enterprise-solr6-52
+    run_list:
+      - recipe[alfresco::default]
+      - recipe[alfresco::redeploy]
+    data_bags_path: "test/integration/data_bags"
+    verifier:
+      inspec_tests:
+        - name: nginx-hardening
+          git: https://github.com/Alfresco/tests-nginx-hardening
+    attributes: {
+      "name": "chef-alfresco-enterprise-52",
+      "hostname": "alfresco-allinone-test",
+      "alfresco" : {
+        "version" : "5.2.0",
+        "components" : ["haproxy","nginx","tomcat","transform","repo","share","solr6","mysql","aos","rm"],
+        "edition" : "enterprise",
+        "ssl_enabled" : false
+      },
+      "artifact-deployer" : {
+        "maven" : {
+          "timeout" : 1500,
+          "repositories" : {
+            "internal" : {
+              "url" : "https://artifacts.alfresco.com/nexus/content/groups/internal",
+              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
+              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             },
-            "alfresco-staging-platform" : {
+            "internal-staging" : {
               "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-staging",
               "username" : "<%= ENV['NEXUS_USERNAME'] %>",
               "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
+            },
+            "internal-releases" : {
+              "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-releases",
+              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
+              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
+            },
+            "staging" : {
+              "url" : "https://artifacts.alfresco.com/nexus/content/groups/staging",
+              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
+              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
             }
           }
         }

diff --git a/attributes/_solr6.rb b/attributes/_solr6.rb
@@ -17,3 +17,5 @@
 default['artifacts']['alfresco-search-services']['unzip'] = true
 default['artifacts']['alfresco-search-services']['destination'] = node['solr6']['installation-path']
 default['artifacts']['alfresco-search-services']['artifactId'] = 'alfresco-search-services'
+# increasing timeout from 10 to 20 minutes because of Solr size
+default['artifacts']['alfresco-search-services']['timeout'] = 1200
diff --git a/attributes/alfrescoproperties.rb b/attributes/alfrescoproperties.rb
@@ -13,13 +13,13 @@
 default['alfresco']['properties']['db.params'] = 'useUnicode=yes&characterEncoding=UTF-8'
 default['alfresco']['properties']['db.ssl_params'] = node['alfresco']['db_ssl_enabled'] == true ? "&useSSL=true&requireSSL=true&verifyServerCertificate=true&trustCertificateKeyStoreUrl=file://#{node['alfresco']['truststore_file']}&trustCertificateKeyStoreType=#{node['alfresco']['truststore_type']}&trustCertificateKeyStorePassword=#{node['alfresco']['truststore_password']}" : ''
 default['alfresco']['properties']['db.url'] = "jdbc:${db.prefix}://${db.host}/${db.dbname}?${db.params}${db.ssl_params}"
-node.set['alfresco']['properties']['db.pool.initial'] = 30
-node.set['alfresco']['properties']['db.pool.max'] = 500
-node.set['alfresco']['properties']['db.pool.min'] = 0
-node.set['alfresco']['properties']['db.pool.evict.interval'] = 900000
-node.set['alfresco']['properties']['db.pool.evict.idle.min'] = 1800000
-node.set['alfresco']['properties']['db.pool.evict.num.tests'] = -2
-node.set['alfresco']['properties']['db.pool.evict.validate'] = true
+default['alfresco']['properties']['db.pool.initial'] = 30
+default['alfresco']['properties']['db.pool.max'] = 500
+default['alfresco']['properties']['db.pool.min'] = 0
+default['alfresco']['properties']['db.pool.evict.interval'] = 900000
+default['alfresco']['properties']['db.pool.evict.idle.min'] = 1800000
+default['alfresco']['properties']['db.pool.evict.num.tests'] = -2
+default['alfresco']['properties']['db.pool.evict.validate'] = true
 
 default['alfresco']['apply_amps'] = false
 
@@ -40,7 +40,9 @@
 default['alfresco']['properties']['alfresco.context'] = 'alfresco'
 
 #Search Config
-default['alfresco']['properties']['index.subsystem.name'] = 'solr4'
+default['alfresco']['properties']['index.subsystem.name'] = 'solr4' if node['alfresco']['components'].include?('solr')
+default['alfresco']['properties']['index.subsystem.name'] = 'solr6' if node['alfresco']['components'].include?('solr6')
+
 default['alfresco']['properties']['solr.secureComms'] = 'none'
 
 #Email

diff --git a/recipes/solr6.rb b/recipes/solr6.rb
@@ -14,9 +14,6 @@
   action :create
 end
 
-# Solr setting for Alfresco in alfresco-global.properties
-node.default['alfresco']['properties']['index.subsystem.name'] = 'solr6'
-
 # lsof needed by start script
 package 'lsof'