copy from bitbucket

ausybenelux · Jan 5, 2016 · 2ce61d4 · 2ce61d4
1 parent 3a03256
commit 2ce61d4
Show file tree

Hide file tree

Showing 297 changed files with 10,871 additions and 31,838 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/Vagrantfile b/Vagrantfile
@@ -39,9 +39,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #
   config.vm.box = vconfig['config']['box_type']
   config.vm.box_check_update = true
-
+  config.vm.box_url = vconfig['config']['box_url']
   #
-  config.omnibus.chef_version = '12'
+#  config.omnibus.chef_version = '12'
 
   # Hostname
   config.vm.hostname = box_hostname
@@ -50,25 +50,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.ssh.forward_agent = true
   config.ssh.insert_key = false
 
-  # Plugin: Cachier
-  config.cache.scope = :machine
-  config.cache.auto_detect = false
-  config.cache.synced_folder_opts = {
-      type: :nfs,
-      mount_options: ["rw", "vers=3", "udp", "fsc", "actimeo=1"]
-  }
-  config.cache.enable :apt
-  config.cache.enable :apt_lists
-  config.cache.enable :chef
-  config.cache.enable :chef_gem
-  config.cache.enable :composer
-  config.cache.enable :gem
-  config.cache.enable :npm
-  config.cache.enable :generic, {
-      'wget' => {cache_dir: '/var/cache/wget'},
-      'curl' => {cache_dir: '/var/cache/curl'},
-  }
-
   # Fix NFS permission issues
   config.nfs.map_uid = Process.uid
   config.nfs.map_gid = Process.gid
@@ -191,37 +172,22 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     chef.roles_path = 'chef-repo/roles'
 
     #
-    chef.add_role('system')
-
-    #
-    chef.add_role('web-database')
-
-    #
-    chef.add_role('web-httpd')
-
-    #
-    chef.add_role('web-php5')
-
-    #
-    if vconfig['config']['web_tools']['web_tools_install']
-      chef.add_role('web-tools')
-    end
-
-    #
-    if vconfig['config']['solr']['solr_install']
-      chef.add_role('web-solr')
-    end
-
-    #
-    if vconfig['config']['varnish_install']
-      chef.add_role('web-varnish')
-    end
+    #if vconfig['config']['solr']['solr_install']
+    #  chef.add_role('web-solr')
+    #end
+#
+    ##
+    #if vconfig['config']['varnish_install']
+    #  chef.add_role('web-varnish')
+    #end
+#
+    ##
+    #if vconfig['config']['memcached_install']
+    #  chef.add_role('web-memcached')
+    #end
 
     #
-    chef.add_role('frontend')
-
-    #
-    chef.add_role('site')
+    chef.add_role('project')
 
   end
 
@@ -231,10 +197,4 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # set post_up_message
   config.vm.post_up_message = get_vagrant_post_up_message(aliases)
 
-  config.trigger.before :destroy do
-    if File.exists?('backup/file_token')
-      run_remote '/usr/local/bin/backup-db.sh'
-    end
-  end
-
 end
diff --git a/chef-repo/Cheffile b/chef-repo/Cheffile
@@ -4,33 +4,23 @@
 site 'https://supermarket.getchef.com/api/v1'
 
 cookbook 'apt'
-
 cookbook 'git', '= 4.1.0'
-
 cookbook 'curl'
-
 cookbook 'vim'
-
 cookbook 'apache2'
-
 cookbook 'php'
-
 cookbook 'composer'
-
 cookbook 'phing'
-
 cookbook 'hipsnip-jetty'
-
 cookbook 'hipsnip-solr'
-
 cookbook 'memcached'
-
 cookbook 'varnish', '= 1.0.2'
-
 cookbook 'php-fpm'
-
 cookbook 'nodejs'
-
 cookbook 'ruby-ng'
-
 cookbook 'openssl'
+cookbook 'ntp'
+cookbook 'timezone'
+cookbook 'mailcatcher', :github => 'bryantebeek/chef-mailcatcher'
+cookbook 'database'
+cookbook 'mysql2_chef_gem'
diff --git a/chef-repo/Cheffile.lock b/chef-repo/Cheffile.lock
@@ -15,6 +15,8 @@ SITE
     composer (2.2.1)
       php (>= 0.0.0)
     curl (2.0.1)
+    database (4.0.9)
+      postgresql (>= 1.0.0)
     dmg (2.3.0)
     git (4.1.0)
       build-essential (>= 0.0.0)
@@ -33,19 +35,28 @@ SITE
       windows (>= 1.34.6)
     java (1.36.0)
       apt (>= 0.0.0)
+    mariadb (0.3.1)
+      apt (>= 0.0.0)
+      yum (>= 0.0.0)
+      yum-epel (>= 0.0.0)
     memcached (2.0.1)
       compat_resource (>= 0.0.0)
       runit (~> 1.0)
       yum-epel (>= 0.0.0)
     mysql (6.1.2)
       smf (>= 0.0.0)
       yum-mysql-community (>= 0.0.0)
+    mysql2_chef_gem (1.0.2)
+      build-essential (>= 0.0.0)
+      mariadb (>= 0.0.0)
+      mysql (~> 6.0)
     nodejs (2.4.2)
       apt (>= 0.0.0)
       ark (>= 0.0.0)
       build-essential (>= 0.0.0)
       homebrew (>= 0.0.0)
       yum-epel (>= 0.0.0)
+    ntp (1.8.6)
     openssl (4.4.0)
       chef-sugar (>= 3.1.1)
     packagecloud (0.1.0)
@@ -62,6 +73,10 @@ SITE
     php-fpm (0.7.5)
       apt (>= 0.0.0)
       yum (>= 3.0)
+    postgresql (3.4.21)
+      apt (>= 1.9.0)
+      build-essential (>= 0.0.0)
+      openssl (~> 4.0)
     rbac (1.0.3)
     ruby-ng (0.3.0)
       apt (>= 0.0.0)
@@ -70,6 +85,7 @@ SITE
       packagecloud (>= 0.0.0)
     smf (2.2.7)
       rbac (>= 1.0.1)
+    timezone (0.0.1)
     varnish (1.0.2)
       apt (~> 2.4)
       build-essential (>= 0.0.0)
@@ -87,21 +103,33 @@ SITE
     yum-mysql-community (0.1.19)
       yum (>= 3.2)
 
+GIT
+  remote: https://github.com/bryantebeek/chef-mailcatcher
+  ref: master
+  sha: 2d98b3abac59702d8ef88fcfb1b8c956c62aabee
+  specs:
+    mailcatcher (0.1.4)
+
 DEPENDENCIES
   apache2 (>= 0)
   apt (>= 0)
   composer (>= 0)
   curl (>= 0)
+  database (>= 0)
   git (= 4.1.0)
   hipsnip-jetty (>= 0)
   hipsnip-solr (>= 0)
+  mailcatcher (>= 0)
   memcached (>= 0)
+  mysql2_chef_gem (>= 0)
   nodejs (>= 0)
+  ntp (>= 0)
   openssl (>= 0)
   phing (>= 0)
   php (>= 0)
   php-fpm (>= 0)
   ruby-ng (>= 0)
+  timezone (>= 0)
   varnish (= 1.0.2)
   vim (>= 0)
 
diff --git a/chef-repo/cookbooks/database/.gitignore b/chef-repo/cookbooks/database/.gitignore
@@ -0,0 +1,46 @@
+*.gem
+.zero-knife.rb
+*.rbc
+.bundle
+.config
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+Gemfile.lock
+_Store
+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+*.tmp
+*.bk
+*.bkup
+.ruby-version
+.ruby-gemset
+.rvmrc
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/
+.idea
+.ruby-version
+
+#chef stuff
+Berksfile.lock
+.kitchen
+.kitchen.local.yml
+vendor/
+.coverage/
+
+#vagrant stuff
+.vagrant/
+.vagrant.d/