Skip to content

Commit

Permalink
Closes #81 and #82 -- Tomcat Manager user, and sites/default/file per…
Browse files Browse the repository at this point in the history
…missions.
  • Loading branch information
ruebot committed Jul 23, 2015
1 parent c70c7d3 commit a98f992
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provision :shell, path: "./scripts/ffmpeg.sh", :args => shared_dir
config.vm.provision :shell, path: "./scripts/warctools.sh", :args => shared_dir
config.vm.provision :shell, path: "./scripts/sleuthkit.sh", :args => shared_dir
config.vm.provision :shell, path: "./scripts/post.sh"

if File.exist?("./scripts/custom.sh") then
config.vm.provision :shell, path: "./scripts/custom.sh", :args => shared_dir
Expand Down
1 change: 0 additions & 1 deletion scripts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ apt-get -y install maven
# Tomcat
apt-get -y install tomcat7 tomcat7-admin
usermod -a -G tomcat7 vagrant
sed -i '$i<user username="islandora" password="islandora" roles="manager-gui"/>' /etc/tomcat7/tomcat-users.xml

# We still need this for the rest of the times Tomcat is run in the other build scripts
sed -i "s|#JAVA_HOME=/usr/lib/jvm/openjdk-[0-9]\+-jdk|JAVA_HOME=$JAVA_HOME|g" /etc/default/tomcat7
Expand Down
8 changes: 8 additions & 0 deletions scripts/post.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash

# Setup a user for Tomcat Manager
sed -i '$i<user username="islandora" password="islandora" roles="manager-gui"/>' /etc/tomcat7/tomcat-users.xml
service tomcat7 restart

# Set correct permissions on sites/default/files
chmod -R 775 /var/www/drupal/sites/default/files

0 comments on commit a98f992

Please sign in to comment.