Merge pull request #36 from avalonmediasystem/develop

Avalon R5 Release

Vagrantfile

@@ -26,8 +26,8 @@ PORTS.each_pair {|name, mapping| @facts["#{name}::config::public_url"] = "#{mapp
 FactGatherer.gather_facts @facts
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "centos-minimal-desktop"
-  config.vm.box_url = "http://yumrepo-public.library.northwestern.edu/centos_x86_64_minimal_desktop.box"
+  config.vm.box = "centos-6-minimal-desktop"
+  config.vm.box_url = "http://repo.avalonmediasystem.org/centos_x86_64_minimal_desktop.box"
   config.vm.hostname = "avalon-box"
   config.vm.synced_folder "files", "/etc/puppet/avalon_files"
   config.vm.provider :virtualbox do |vb|

bin/build-ova.sh

@@ -30,8 +30,8 @@ done
 
 VBoxManage modifyvm "${VM_UUID}" --nic1 bridged
 
-VBoxManage modifyvm "${VM_UUID}" --name "Avalon Media System 4.0"
+VBoxManage modifyvm "${VM_UUID}" --name "Avalon Media System 5.0"
 
 VBoxManage guestproperty set "${VM_UUID}" /VirtualBox/GuestAdd/Vbgl/Video/SavedMode 1024x768x32
 
-VBoxManage export "${VM_UUID}" --output "avalon-vm-${VM_DATE}.ova" --vsys 0 --product "Avalon Media System" --producturl "http://www.avalonmediasystem.org" --version "R4"
+VBoxManage export "${VM_UUID}" --output "avalon-vm-${VM_DATE}.ova" --vsys 0 --product "Avalon Media System" --producturl "http://www.avalonmediasystem.org" --version "R5"

hiera/data/common.yaml

@@ -1,3 +1,3 @@
 classes:
   - epel
-  - nulrepo
+  - avalonrepo

hiera/data/single-box.yaml

@@ -4,7 +4,7 @@ tomcat::install::http_port: '8983'
 fcrepo::config::user: 'tomcat7'
 fcrepo::config::server_host: 'localhost'
 fcrepo::config::version: '3.6.1'
-avalon::config::ruby_version: 'ruby-2.1.7'
+avalon::config::ruby_version: 'ruby-2.2.5'
 classes:
   - avalon::config
   - avalon::mysql

modules/avalon/manifests/packages.pp

@@ -17,7 +17,7 @@
 
   package { ['cronie', 'curl', 'sqlite-devel', 'mysql-devel', 'v8-devel', 'zip', 'libyaml-devel', 'libffi-devel', 'lsof', 'expect', 'cmake']:
     ensure  => present,
-    require => [Class['epel'],Class['nulrepo']],
+    require => [Class['epel'],Class['avalonrepo']],
   }
 
   service { 'crond':

modules/avalon/manifests/params.pp

@@ -1,14 +1,14 @@
 # Copyright 2011-2013, The Trustees of Indiana University and Northwestern
 #   University.  Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
-# 
+#
 # You may obtain a copy of the License at
-# 
+#
 # http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software distributed 
+#
+# Unless required by applicable law or agreed to in writing, software distributed
 #   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-#   CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the
 #   specific language governing permissions and limitations under the License.
 # ---  END LICENSE_HEADER BLOCK  ---
 

modules/avalonrepo/manifests/init.pp

@@ -0,0 +1,46 @@
+# Copyright 2011-2013, The Trustees of Indiana University and Northwestern
+#   University.  Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+# 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software distributed 
+#   under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+#   CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+#   specific language governing permissions and limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
+class avalonrepo {
+  yumrepo { 'avalon-public':
+    name     => 'avalon_public',
+    descr    => 'Avalon Media System RHEL repository',
+    baseurl  => 'http://repo.avalonmediasystem.org/x86_64',
+    cost     => '150',
+    enabled  => '1',
+    gpgcheck => '1',
+    gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-avalon',
+    require  => File['/etc/pki/rpm-gpg/RPM-GPG-KEY-avalon'],
+
+	}
+
+  yumrepo { 'avalon-public-sources':
+    name      => 'avalon_public_sources',
+    descr     => 'Avalon Media System SRPMS repository',
+    baseurl   => 'http://repo.avalonmediasystem.org/SRPMS',
+    cost      => '100',
+    enabled   => '1',
+    gpgcheck  => '1',
+    gpgkey    => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-avalon',
+    require   => File['/etc/pki/rpm-gpg/RPM-GPG-KEY-avalon'],
+  }
+
+	file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-avalon':
+		ensure => present,
+		owner  => 'root',
+		group  => 'root',
+		mode   => '0644',
+		source => 'puppet:///local/RPM-GPG-KEY-avalon'
+	}
+}

modules/ffmpeg/manifests/init.pp

@@ -18,7 +18,7 @@
   $version = '2.4.2-1.el6'
 ) {
   include epel
-  include nulrepo
+  include avalonrepo
 
   $ffmpeg_ver = $version
   $specfile   = 'ffmpeg24.spec'
@@ -75,7 +75,7 @@
   }
   package { $ffmpeg_req:
     ensure  => installed,
-    require => [Class['epel'],Class['nulrepo']]
+    require => [Class['epel'],Class['avalonrepo']]
   }
 
   exec { 'yum Group Install':

modules/red5/manifests/install.pp

@@ -20,7 +20,7 @@
   }
 
   staging::file { "red5-1.0.1.tar.gz":
-    source  => "http://yumrepo-public.library.northwestern.edu/red5-1.0.1.tar.gz",
+    source  => "http://repo.avalonmediasystem.org/red5-1.0.1.tar.gz",
     timeout => 1200,
     subdir  => red5,
   }