Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use ubuntu/xenial64 over bento/ubuntu-16.04; Address #405. #408

Merged
merged 2 commits into from
Nov 15, 2016
Merged

Use ubuntu/xenial64 over bento/ubuntu-16.04; Address #405. #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce61029
Use ubuntu/xenial64 over bento/ubuntu-16.04; Address #405.
ruebot Oct 29, 2016
b07878e
fix submodules
ruebot Nov 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ cache.properties
tests/test_config.ini
install/.vagrant
install/downloads
install/ubuntu-xenial-16.04-cloudimg-console.log
site/
installer
composer.phar
Expand Down
26 changes: 15 additions & 11 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
[submodule "Crayfish"]
path = Crayfish
url = https://github.com/Islandora-CLAW/Crayfish
path = Crayfish
url = https://github.com/Islandora-CLAW/Crayfish
branch = master
[submodule "Alpaca"]
path = Alpaca
url = https://github.com/Islandora-CLAW/Alpaca
path = Alpaca
url = https://github.com/Islandora-CLAW/Alpaca
branch = master
[submodule "pdx"]
path = pdx
url = https://github.com/Islandora-CLAW/pdx
path = pdx
url = https://github.com/Islandora-CLAW/pdx
branch = master
[submodule "chullo"]
path = chullo
url = https://github.com/Islandora-CLAW/chullo
path = chullo
url = https://github.com/Islandora-CLAW/chullo
branch = master
[submodule "islandora"]
path = islandora
url = https://github.com/Islandora-CLAW/islandora
branch = 8.x-1.x
path = islandora
url = https://github.com/Islandora-CLAW/islandora
branch = 8.x-1.x
2 changes: 1 addition & 1 deletion Alpaca
Open in desktop
Submodule Alpaca updated from e16d33 to 958e14
2 changes: 1 addition & 1 deletion install/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end

# Every Vagrant virtual environment requires a box to build off of.
config.vm.box = "bento/ubuntu-16.04"
config.vm.box = "ubuntu/xenial64"

# Setup the shared folder
home_dir = "/home/vagrant"
Expand Down
2 changes: 1 addition & 1 deletion install/configs/variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ SOLR_HOME="/var/lib/tomcat7/solr"
BLAZEGRAPH_VERSION=2.1.4
DRUPAL_HOME="/var/www/html/drupal"
DRUPAL_VERSION=8.1.8
FITS_VERSION=1.0.2
FITS_VERSION=1.0.3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're doing it again :P

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. My bad. I forgot I did that. I can back that out if you want.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't worry about this one. Next time, @ruebot, next time...

FITS_WS_VERSION=1.1.3
8 changes: 4 additions & 4 deletions install/scripts/alpaca.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ fi
cd "$HOME_DIR"
git clone https://github.com/Islandora-CLAW/Alpaca.git
cd Alpaca
chown -R vagrant:vagrant "$HOME_DIR/Alpaca"
sudo -u vagrant ./gradlew build
chown -R ubuntu:ubuntu "$HOME_DIR/Alpaca"
sudo -u ubuntu ./gradlew build

# Chown everything over to the vagrant user just in case
chown -R vagrant:vagrant "$HOME_DIR/Alpaca"
# Chown everything over to the ubuntu user just in case
chown -R ubuntu:ubuntu "$HOME_DIR/Alpaca"
2 changes: 1 addition & 1 deletion install/scripts/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ apt-get -y -qq install maven

# Tomcat
apt-get -y -qq install tomcat7 tomcat7-admin
usermod -a -G tomcat7 vagrant
usermod -a -G tomcat7 ubuntu
sed -i '$i<user username="islandora" password="islandora" roles="manager-gui"/>' /etc/tomcat7/tomcat-users.xml

# Wget and curl
Expand Down
2 changes: 1 addition & 1 deletion install/scripts/drupal-console.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ -f ".console/config.yml" ]; then
rm .console/config.yml
fi
cp $HOME_DIR/islandora/install/configs/config.yml $HOME_DIR/.console/config.yml
chown -hR vagrant:vagrant /home/vagrant/.console
chown -hR ubuntu:ubuntu /home/ubuntu/.console
sed -i -e "\$asource \"$HOME/.console/console.rc\" 2>/dev/null" $HOME/.bashrc

# Fix drupal-console
Expand Down
2 changes: 1 addition & 1 deletion install/scripts/islandora-microservices.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ cp "/opt/microservices/pdx/config/example.settings.yml" "/opt/microservices/pdx/
cd "/opt/microservices/pdx"
composer update

chown -hR vagrant:vagrant /opt/microservices
chown -hR ubuntu:ubuntu /opt/microservices
4 changes: 2 additions & 2 deletions install/scripts/karaf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ if [ ! -L "/etc/init.d/karaf-service" ]; then
echo " done"
fi

# Add the vagrant user's maven repository
# Add the ubuntu user's maven repository
if ! grep -q "$HOME_DIR/.m2/repository" $KARAF_DIR/etc/org.ops4j.pax.url.mvn.cfg ; then
echo "Adding vagrant user's Maven repository... "
echo "Adding ubuntu user's Maven repository... "
sed -i "s|#org.ops4j.pax.url.mvn.localRepository=|org.ops4j.pax.url.mvn.localRepository=$HOME_DIR/.m2/repository|" $KARAF_DIR/etc/org.ops4j.pax.url.mvn.cfg
echo " done"
fi
Expand Down
4 changes: 2 additions & 2 deletions install/scripts/lamp-server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ PACKAGES="libwrap0 ssl-cert libterm-readkey-perl mysql-client libdbi-perl libmys

apt-get -qq install -y $PACKAGES

usermod -a -G www-data vagrant
usermod -a -G www-data ubuntu

chown -R vagrant:vagrant islandora
chown -R ubuntu:ubuntu islandora

sed -i '$idate.timezone=America/Toronto' /etc/php/7.0/cli/php.ini
2 changes: 1 addition & 1 deletion install/scripts/post-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ chown -R www-data:www-data /var/www/html
chmod -R g+w /var/www/html

# Chown the home directory for good measure
chown -R vagrant:vagrant "$HOME_DIR"
chown -R ubuntu:ubuntu "$HOME_DIR"

# Fix FITS log
sed -i 's|log4j.appender.FILE.File=${catalina.home}/logs/fits-service.log|log4j.appender.FILE.File=/var/log/tomcat7/fits-service.log|g' /var/lib/tomcat7/webapps/fits/WEB-INF/classes/log4j.properties
Expand Down