Initial pass at adding 16.04 support.

zivtech · Jan 23, 2017 · 3ece49e · 3ece49e
1 parent 0654214
commit 3ece49e
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 43 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -15,11 +15,18 @@ mod 'maestrodev-wget'
 mod 'saz-memcached'
 mod 'rodjek-logrotate'
 
-mod 'zivtech-drush'
 mod 'zivtech-drush_fetcher'
-mod 'zivtech-drupal_php'
+#mod 'zivtech-drupal_php'
 mod 'zivtech-drupal_solr'
 
+mod 'zivtech-drush',
+  :git => "git://github.com/zivtech/puppet-drush.git",
+  :ref => 'php7'
+
+mod 'zivtech-drupal_php',
+  :git => "git://github.com/zivtech/puppet-drupal-php.git",
+  :ref => 'php7'
+
 mod 'zivtech-webadmin',
   :git => "git://github.com/zivtech/puppet-webadmin.git",
   :ref => 'master'
diff --git a/Puppetfile.lock b/Puppetfile.lock
@@ -1,53 +1,71 @@
 FORGE
   remote: https://forge.puppet.com
   specs:
+    darin-zypprepo (1.0.2)
+    example42-puppi (2.2.1)
+    example42-yum (2.1.28)
+      example42-puppi (>= 2.0.0)
     maestrodev-wget (1.7.3)
-    nodes-php (0.9.0)
-      puppetlabs-apt (> 0.0.0)
-      puppetlabs-inifile (> 0.0.0)
-      puppetlabs-stdlib (> 0.0.0)
-    puppet-staging (1.0.7)
-    puppetlabs-apache (1.10.0)
+    mayflower-php (4.0.0-beta1)
+      darin-zypprepo (~> 1.0)
+      example42-yum (~> 2.0)
+      puppetlabs-apt (< 3.0.0, >= 1.8.0)
+      puppetlabs-inifile (~> 1.0)
+      puppetlabs-stdlib (< 5.0.0, >= 4.2.0)
+    puppet-staging (2.1.0)
+    puppetlabs-apache (1.11.0)
       puppetlabs-concat (< 3.0.0, >= 1.1.1)
-      puppetlabs-stdlib (< 5.0.0, >= 2.4.0)
-    puppetlabs-apt (2.2.2)
+      puppetlabs-stdlib (< 5.0.0, >= 4.2.0)
+    puppetlabs-apt (2.3.0)
       puppetlabs-stdlib (< 5.0.0, >= 4.5.0)
-    puppetlabs-concat (2.1.0)
-      puppetlabs-stdlib (< 5.0.0, >= 3.2.0)
-    puppetlabs-firewall (1.8.1)
+    puppetlabs-concat (2.2.0)
+      puppetlabs-stdlib (< 5.0.0, >= 4.2.0)
+    puppetlabs-firewall (1.8.2)
     puppetlabs-gcc (0.3.0)
       puppetlabs-stdlib (< 5.0.0, >= 2.0.0)
-    puppetlabs-git (0.4.0)
+    puppetlabs-git (0.5.0)
       puppetlabs-stdlib (>= 3.2.0)
-    puppetlabs-inifile (1.5.0)
-    puppetlabs-mysql (3.8.0)
-      puppet-staging (< 2.0.0, >= 1.0.1)
+    puppetlabs-inifile (1.6.0)
+    puppetlabs-mysql (3.10.0)
+      puppet-staging (< 3.0.0, >= 1.0.1)
       puppetlabs-stdlib (< 5.0.0, >= 3.2.0)
-    puppetlabs-nodejs (0.8.0)
+    puppetlabs-nodejs (999.999.999)
       puppetlabs-stdlib (< 5.0.0, >= 2.2.1)
-    puppetlabs-stdlib (4.12.0)
-    puppetlabs-vcsrepo (1.3.2)
+    puppetlabs-stdlib (4.15.0)
+    puppetlabs-vcsrepo (1.5.0)
     rodjek-logrotate (1.1.1)
-    saz-memcached (2.8.1)
-      puppetlabs-firewall (>= 0.1.0)
-      puppetlabs-stdlib (>= 3.2.0)
+    saz-memcached (3.0.1)
+      puppetlabs-firewall (< 2.0.0, >= 0.1.0)
+      puppetlabs-stdlib (< 6.0.0, >= 4.6.0)
     yo61-logrotate (1.4.0)
       puppetlabs-stdlib (< 5.0.0, >= 1.0.0)
-    zivtech-drupal_php (3.2.0)
-      nodes-php (>= 0.9.0)
-      puppetlabs-apache (>= 1.0.0)
-      puppetlabs-stdlib (>= 1.0.0)
     zivtech-drupal_solr (2.0.0)
       yo61-logrotate (>= 0.0.0)
-    zivtech-drush (1.2.1)
-      nodes-php (>= 0.8.0)
-      puppetlabs-concat (>= 1.0.0)
-      puppetlabs-stdlib (>= 1.0.0)
-      puppetlabs-vcsrepo (>= 0.0.0)
     zivtech-drush_fetcher (1.0.3)
       puppetlabs-stdlib (>= 1.0.0)
       zivtech-drush (>= 0.0.0)
 
+GIT
+  remote: git://github.com/zivtech/puppet-drupal-php.git
+  ref: php7
+  sha: 3561974954b48d580bf375642ee820f6fe223e51
+  specs:
+    zivtech-drupal_php (4.0.0)
+      mayflower-php (>= 4.0.0)
+      puppetlabs-apache (>= 1.0.0)
+      puppetlabs-stdlib (>= 1.0.0)
+
+GIT
+  remote: git://github.com/zivtech/puppet-drush.git
+  ref: php7
+  sha: 6777271ab293c0aaf70d2356fb93a0593e4db7cd
+  specs:
+    zivtech-drush (1.2.1)
+      puppetlabs-concat (>= 1.0.0)
+      puppetlabs-stdlib (>= 1.0.0)
+      puppetlabs-vcsrepo (>= 0)
+      zivtech-drupal_php (>= 3.4.1)
+
 GIT
   remote: git://github.com/zivtech/puppet-webadmin.git
   ref: master

diff --git a/Vagrantfile b/Vagrantfile
@@ -79,18 +79,21 @@ Vagrant.configure('2') do |config|
 
 
   config.vm.provision :puppet do |puppet|
-    puppet.module_path = [
-      'modules',
-      'custom-modules'
-    ]
     puppet.facter = {
       "vagrant" => "1",
       "vagrant_share_www" => vagrant_share_www
     }
-    puppet.manifests_path = 'manifests'
-    puppet.manifest_file = 'base.pp'
     puppet.hiera_config_path = 'hiera/hiera.yaml'
     puppet.working_directory = '/vagrant'
+    puppet.manifests_path = 'manifests'
+    puppet.module_path = [
+      "modules",
+      "custom-modules"
+    ]
+    puppet.manifests_path = "manifests"
+    puppet.manifest_file = "."
+    puppet.environment_path = "environments"
+    puppet.environment = "dev"
   end
 
 

diff --git a/custom-modules/phpmyadmin/manifests/init.pp b/custom-modules/phpmyadmin/manifests/init.pp
@@ -7,7 +7,7 @@
   file { "/etc/apache2/sites-available/phpmyadmin.conf":
     owner => root,
     group => root,
-    mode => 644,
+    mode => '0644',
     ensure => file,
     source => "puppet:///modules/phpmyadmin/phpmyadmin.conf",
   }

diff --git a/default.config.yaml b/default.config.yaml
@@ -1,14 +1,15 @@
 # The hostname that gets set inside the VM.
 # When using browsersync for front-end development we need to proxy the vm and the .local hostname is already in use by the native Bonjour app on OSX.
 # Using local for the hostname makes browsersync unusable in this configuration, so we have updated the local hostname to vm instead.
-hostname: "vm"
+hostname: "local.zivtech.com"
 # The private IP to provision for this host.
 private_ip: "33.33.33.40"
 # The base box to use to build the puppet work on top of.
-# Commenting out the two lines below (or overriding in config,yaml)
+# Comment out the two lines below (or overriding in config,yaml)
 # to switch to 12.04.
-box: "puppetlabs/ubuntu-14.04-64-puppet-1.0.0"
-box_url: "https://atlas.hashicorp.com/puppetlabs/boxes/ubuntu-14.04-64-puppet/versions/1.0.0/providers/virtualbox.box"
+box: "zivtech/ubuntu-16.04-server-puppet-4"
+#box: "puppetlabs/ubuntu-14.04-64-puppet-1.0.0"
+#box_url: "https://atlas.hashicorp.com/puppetlabs/boxes/ubuntu-14.04-64-puppet/versions/1.0.0/providers/virtualbox.box"
 # Un-comment the next two lines, to use 12.04
 #box: "puppetlabs/ubuntu-12.04-64-puppet-1.0.0"
 #box_url: "https://atlas.hashicorp.com/puppetlabs/boxes/ubuntu-12.04-64-puppet/versions/1.0.0/providers/virtualbox.box"

diff --git a/environments/dev/environment.conf b/environments/dev/environment.conf
@@ -0,0 +1,3 @@
+[main]
+modulepath = '/etc/puppetlabs/code/custom-modules:/etc/puppetlabs/code/modules'
+manifest = '/etc/puppetlabs/code/manifests'
diff --git a/manifests/base.pp → manifests/default.pp b/manifests/base.pp → manifests/default.pp