Implements BBB 1.11

instructions : http://docs.bigbluebutton.org/1.1/install.html
softwaremill · Jun 15, 2017 · be4e0c5 · be4e0c5
1 parent 2baf738
commit be4e0c5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ python: "2.7"
 # Use the new container infrastructure
 sudo: required
 
-dist: trusty
+dist: xenial
 
 # Install ansible
 addons:

diff --git a/Vagrantfile b/Vagrantfile
@@ -6,7 +6,7 @@
 # backwards compatibility). Please don't change it unless you know what
 # you're doing.
 Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ubuntu/xenial64"
 
   config.vm.network "private_network", ip: "10.10.10.10"
 

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,7 +1,5 @@
 ---
-bbb_apt_key: '328BD16D'
+bbb_apt_key: 'FAB46452'
 
 #Repositories
-bbb_apt_repo_url: 'http://ubuntu.bigbluebutton.org/trusty-1-0/'
-libreoffice_ppa: 'ppa:libreoffice/libreoffice-4-4'
-ffmpeg_ppa: 'ppa:mc3man/trusty-media'
+bbb_apt_repo_url: 'http://ubuntu.bigbluebutton.org/xenial-110/'
diff --git a/meta/main.yml b/meta/main.yml
@@ -110,11 +110,11 @@ galaxy_info:
   #  - quantal
   #  - raring
   #  - saucy
-    - trusty
+  #  - trusty
   #  - utopic
   #  - vivid
   #  - wily
-  #  - xenial
+    - xenial
   #- name: SLES
   #  versions:
   #  - all

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -38,30 +38,18 @@
 - name: multiverse apt repositories are enabled
   apt_repository: repo={{ item }} state=present
   with_items:
-    - 'deb http://archive.ubuntu.com/ubuntu trusty multiverse'
-    - 'deb-src http://archive.ubuntu.com/ubuntu trusty multiverse'
-    - 'deb http://archive.ubuntu.com/ubuntu trusty-updates multiverse'
-    - 'deb-src http://archive.ubuntu.com/ubuntu trusty-updates multiverse'
+    - 'deb http://archive.ubuntu.com/ubuntu xenial multiverse'
+    - 'deb-src http://archive.ubuntu.com/ubuntu xenial multiverse'
+    - 'deb http://archive.ubuntu.com/ubuntu xenial-updates multiverse'
+    - 'deb-src http://archive.ubuntu.com/ubuntu xenial-updates multiverse'
   tags:
     - multiverse_repositories
     - repositories
 
-- name: libreoffice ppa is enabled
-  apt_repository: repo='{{ libreoffice_ppa }}'
-  tags:
-    - libreoffice_repositories
-    - repositories
-
-- name: ffmpeg ppa is enabled
-  apt_repository: repo='{{ ffmpeg_ppa }}'
-  tags:
-    - ffmpeg_repositories
-    - repositories
-
 - name: BigBlueButton repo is enabled
   apt_repository: repo={{ item }} state=present
   with_items:
-    - 'deb {{ bbb_apt_repo_url }} bigbluebutton-trusty main'
+    - 'deb {{ bbb_apt_repo_url }} bigbluebutton-xenial main'
   tags:
     - bbb_repositories
     - repositories