From a7690adf0b371cabcead92df14030baf4b968e04 Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Wed, 18 Nov 2020 13:00:47 -0500
Subject: [PATCH 01/11] Fixing issues with Travis CI

---
 .travis.yml      | 14 +++++---------
 docs/_config.yml |  2 ++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d05bf1451..c3da88cc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic
 
 services:
   - postgresql
@@ -23,6 +23,10 @@ addons:
       - liquidsoap-plugin-vorbis
       - python3-gst-1.0
       - silan
+      - python3-gi
+      - python3-gi-cairo
+      - gcc
+      - gir1.2-gtk-3.0
 
 jobs:
   include:
@@ -32,15 +36,9 @@ jobs:
     - language: php
       php: 7.2
       stage: test
-    - language: php
-      php: 7.1
-      stage: test
     - language: php
       php: 7.0
       stage: test
-    - language: php
-      php: 5.6
-      stage: test
     - language: python
       python: 3.8
       stage: test
@@ -70,8 +68,6 @@ jobs:
       php: 7.3
     - language: php
       php: 7.2
-    - language: php
-      php: 7.1
     # https://github.com/LibreTime/libretime/issues/1041
     - language: python
       python: 3.5
diff --git a/docs/_config.yml b/docs/_config.yml
index 09770b95e..0ae25cec2 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -10,6 +10,8 @@ includes_dir: _includes
 
 favicon: favicon.ico
 
+exclude: ['jekyll.sh'
+]
 # For splash page layout only
 headimage: img/header.jpg
 headtext: Open Source Radio Automation

From 8d44ea848085cc7b4fac1a2bbbd7ea1a55dcf054 Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Wed, 18 Nov 2020 13:43:18 -0500
Subject: [PATCH 02/11] Adding back tests for @paddatrapper

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index c3da88cc1..f041608d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,9 +36,15 @@ jobs:
     - language: php
       php: 7.2
       stage: test
+    - language: php
+      php: 7.1
+      stage: test
     - language: php
       php: 7.0
       stage: test
+    - language: php
+      php: 5.6
+      stage: test
     - language: python
       python: 3.8
       stage: test
@@ -68,6 +74,8 @@ jobs:
       php: 7.3
     - language: php
       php: 7.2
+    - language: php
+      php: 7.1
     # https://github.com/LibreTime/libretime/issues/1041
     - language: python
       python: 3.5

From 4e2fdb9bd1d21d34e9da2e5be601757d5184eae5 Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Wed, 18 Nov 2020 13:49:03 -0500
Subject: [PATCH 03/11] Move Jekyll script

---
 docs/_config.yml            | 2 --
 docs/jekyll.sh => jekyll.sh | 0
 2 files changed, 2 deletions(-)
 rename docs/jekyll.sh => jekyll.sh (100%)

diff --git a/docs/_config.yml b/docs/_config.yml
index 0ae25cec2..09770b95e 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -10,8 +10,6 @@ includes_dir: _includes
 
 favicon: favicon.ico
 
-exclude: ['jekyll.sh'
-]
 # For splash page layout only
 headimage: img/header.jpg
 headtext: Open Source Radio Automation
diff --git a/docs/jekyll.sh b/jekyll.sh
similarity index 100%
rename from docs/jekyll.sh
rename to jekyll.sh

From 384435964d5fea905e79ea82557498b8c32576c1 Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Wed, 18 Nov 2020 14:09:50 -0500
Subject: [PATCH 04/11] Modifying Jekyll install script

---
 jekyll.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/jekyll.sh b/jekyll.sh
index 75b0ddf00..768f29a8d 100644
--- a/jekyll.sh
+++ b/jekyll.sh
@@ -3,7 +3,7 @@
 # someone to use to get Jekyll building outside of GitHub
 
 echo "Installing Ruby"
-sudo apt-get install ruby-full build-essential zlib1g-dev
+apt-get install -y ruby-full build-essential zlib1g-dev
 
 export GEM_HOME=".gems"
 export PATH=".gems/bin:$PATH"
@@ -13,6 +13,4 @@ cd docs
 gem install jekyll bundler
 
 # Running Jekyll
-bundle exec jekyll serve --watch --port 8888
-
-echo "Visit http://localhost:8888 to see the LibreTime website."
+jekyll serve 

From 388733ffa349fe515c6d2626f3b089d7d7e10ef3 Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Wed, 18 Nov 2020 14:12:39 -0500
Subject: [PATCH 05/11] :'( @paddatrapper

---
 .travis.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f041608d7..d05bf1451 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: bionic
+dist: xenial
 
 services:
   - postgresql
@@ -23,10 +23,6 @@ addons:
       - liquidsoap-plugin-vorbis
       - python3-gst-1.0
       - silan
-      - python3-gi
-      - python3-gi-cairo
-      - gcc
-      - gir1.2-gtk-3.0
 
 jobs:
   include:

From 852cf63834a2f5655076d262e4ea0abd1d17f33a Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Wed, 18 Nov 2020 14:16:29 -0500
Subject: [PATCH 06/11] Giving Jekyll a place in Vagrantfile

---
 Vagrantfile | 4 +++-
 jekyll.sh   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 6fd580319..3125f1435 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -10,6 +10,8 @@ Vagrant.configure("2") do |config|
   # liquidsoap input harbors for instreaming (ie. /master)
   config.vm.network "forwarded_port", guest: 8001, host:8001
   config.vm.network "forwarded_port", guest: 8002, host:8002
+  # for Jekyll serve
+  config.vm.network "forwarded_port", guest: 8888, host:8888
 
   # make sure we are using nfs (doesn't work out of the box with debian)
   nfsPath = "."
@@ -69,7 +71,7 @@ Vagrant.configure("2") do |config|
     config.vm.provision "install", type: "shell", inline: "cd /vagrant; ./install %s --web-port=8080" % installer_args
 
     # Provision docs
-    config.vm.provision "build-site-jekyll", type: "shell", path: "docs/jekyll.sh"
+    config.vm.provision "build-site-jekyll", type: "shell", path: "./jekyll.sh"
   end
 
 end
diff --git a/jekyll.sh b/jekyll.sh
index 768f29a8d..1a058a4f4 100644
--- a/jekyll.sh
+++ b/jekyll.sh
@@ -13,4 +13,4 @@ cd docs
 gem install jekyll bundler
 
 # Running Jekyll
-jekyll serve 
+jekyll serve --port 8888

From e84fe4b67f9048ab3372fc317c286ecdf14f9483 Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Wed, 18 Nov 2020 14:18:27 -0500
Subject: [PATCH 07/11] Automating apt update - works

---
 jekyll.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jekyll.sh b/jekyll.sh
index 1a058a4f4..c02e5f868 100644
--- a/jekyll.sh
+++ b/jekyll.sh
@@ -3,7 +3,7 @@
 # someone to use to get Jekyll building outside of GitHub
 
 echo "Installing Ruby"
-apt-get install -y ruby-full build-essential zlib1g-dev
+apt-get update -y && apt-get install -y ruby-full build-essential zlib1g-dev
 
 export GEM_HOME=".gems"
 export PATH=".gems/bin:$PATH"

From 650d635d98e531e713c4196b00a59d058b324e16 Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Wed, 18 Nov 2020 15:03:40 -0500
Subject: [PATCH 08/11] Fixing issue with Vagrant

---
 jekyll.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/jekyll.sh b/jekyll.sh
index c02e5f868..ea117e27d 100644
--- a/jekyll.sh
+++ b/jekyll.sh
@@ -9,7 +9,16 @@ export GEM_HOME=".gems"
 export PATH=".gems/bin:$PATH"
 
 echo "Installing Jekyll"
-cd docs
+
+# Picking different directory if installing with Vagrant
+localUser=$(who am i | awk '{print $1}')
+if [ $localUser == vagrant ]
+then 
+	cd /vagrant/docs
+else
+	cd docs
+fi
+
 gem install jekyll bundler
 
 # Running Jekyll

From f0901b56361574d4363bfac29c417bd746a7ac1d Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Wed, 18 Nov 2020 15:42:22 -0500
Subject: [PATCH 09/11] Specifying hostname for build

---
 jekyll.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jekyll.sh b/jekyll.sh
index ea117e27d..ff9fda15c 100644
--- a/jekyll.sh
+++ b/jekyll.sh
@@ -22,4 +22,4 @@ fi
 gem install jekyll bundler
 
 # Running Jekyll
-jekyll serve --port 8888
+jekyll serve --port 8888 --host 0.0.0.0

From dc57d08bd552631db08495c894890b40032d520d Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Wed, 18 Nov 2020 16:37:35 -0500
Subject: [PATCH 10/11] Removing Jekyll from Vagrant

---
 Vagrantfile |  5 -----
 jekyll.sh   | 16 +++-------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 3125f1435..19650274e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -10,8 +10,6 @@ Vagrant.configure("2") do |config|
   # liquidsoap input harbors for instreaming (ie. /master)
   config.vm.network "forwarded_port", guest: 8001, host:8001
   config.vm.network "forwarded_port", guest: 8002, host:8002
-  # for Jekyll serve
-  config.vm.network "forwarded_port", guest: 8888, host:8888
 
   # make sure we are using nfs (doesn't work out of the box with debian)
   nfsPath = "."
@@ -69,9 +67,6 @@ Vagrant.configure("2") do |config|
 
     # Provision LibreTime
     config.vm.provision "install", type: "shell", inline: "cd /vagrant; ./install %s --web-port=8080" % installer_args
-
-    # Provision docs
-    config.vm.provision "build-site-jekyll", type: "shell", path: "./jekyll.sh"
   end
 
 end
diff --git a/jekyll.sh b/jekyll.sh
index ff9fda15c..aa8af1ab0 100644
--- a/jekyll.sh
+++ b/jekyll.sh
@@ -1,6 +1,4 @@
-# Installing Jekyll
-# This script does not work and exists as a skeleton for
-# someone to use to get Jekyll building outside of GitHub
+#/bin/bash
 
 echo "Installing Ruby"
 apt-get update -y && apt-get install -y ruby-full build-essential zlib1g-dev
@@ -10,16 +8,8 @@ export PATH=".gems/bin:$PATH"
 
 echo "Installing Jekyll"
 
-# Picking different directory if installing with Vagrant
-localUser=$(who am i | awk '{print $1}')
-if [ $localUser == vagrant ]
-then 
-	cd /vagrant/docs
-else
-	cd docs
-fi
-
+cd docs
 gem install jekyll bundler
 
 # Running Jekyll
-jekyll serve --port 8888 --host 0.0.0.0
+jekyll serve

From 2458b3edcd50dfce161dfcef495fab04667b0323 Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Wed, 18 Nov 2020 16:41:29 -0500
Subject: [PATCH 11/11] Updating .gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 70c7c2d12..fb7037ec1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,5 @@ airtime_mvc/tests/log/*.log
 .DS_Store
 .idea/
 /docs/_site/*
-/docs/.jekyll-cache/*
\ No newline at end of file
+/docs/.jekyll-cache/*
+/docs/.gems/*
\ No newline at end of file