Merge pull request #46 from JamborJan/development

Merge Development to Master

Author: JamborJan

.gitignore

@@ -20,3 +20,4 @@ frontend/install.sh
 frontend/bower_components
 *.spk
 *.zip
+/paperwork

.sandstorm/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Version 8
+
+Bugfixes:
+- Some performance improvements due to update to latest Paperwork version
+- Fixed a blank screen issue due to update to latest Paperwork version https://github.com/JamborJan/paperwork/issues/45
+- Import issues fixed, see https://github.com/twostairs/paperwork/issues/667 (the import is still kind of weak)
+
+House keeping:
+- Improved build process to allow easier updates of the Sandstorm port when Paperwork is updated
+- Updated to latest Paperwork version
+- Updated the vagrant lemp-stack settings
+- Updated from nodejs version 5 to version 6 LTS
+
 ## Version 7
 This version has a new app ID. It requires Sandstorm v0.146 (2016-02-21) to allow seamless update to this version.
 

.sandstorm/app-graphics/paperwork_example_01.png

@@ -3,9 +3,10 @@
 
 set -euo pipefail
 
-cd /opt/app/frontend
+# Setup composer
+cd /opt/app/paperwork/frontend
 
-if [ -f /opt/app/frontend/composer.json ] ; then
+if [ -f /opt/app/paperwork/frontend/composer.json ] ; then
     if [ ! -f composer.phar ] ; then
         curl -sS https://getcomposer.org/installer | php
     fi
@@ -15,6 +16,7 @@ php composer.phar self-update
 
 # Install paperwork's npm dependencies
 npm install
+npm update
 
 # Install bower dependencies
 bower install
@@ -23,6 +25,9 @@ bower install
 gulp
 
 # link storage folder
-rm -rf /opt/app/frontend/app/storage
+rm -rf /opt/app/paperwork/frontend/app/storage
 rm -rf /var/storage
-ln -s /var/storage /opt/app/frontend/app
+ln -s /var/storage /opt/app/paperwork/frontend/app
+
+# Some files needed to be changed for ruinning Paperwork on Sandstorm
+cp -rf /opt/app/changedfiles/frontend/* /opt/app/paperwork/frontend

.sandstorm/app-graphics/paperwork_example_02.png

@@ -3,23 +3,20 @@
 # Create a bunch of folders under the clean /var that php, nginx, and mysql expect to exist
 mkdir -p /var/lib/mysql
 mkdir -p /var/lib/nginx
+mkdir -p /var/lib/php5/sessions
 mkdir -p /var/log
 mkdir -p /var/log/mysql
 mkdir -p /var/log/nginx
 # Wipe /var/run, since pidfiles and socket files from previous launches should go away
 # TODO someday: I'd prefer a tmpfs for these.
 rm -rf /var/run
 mkdir -p /var/run
+rm -rf /var/tmp
+mkdir -p /var/tmp
 mkdir -p /var/run/mysqld
 
-# move storage folders which must be writable to /var
-mkdir -p /var/storage
-mkdir -p /var/storage/attachments
-mkdir -p /var/storage/cache
-mkdir -p /var/storage/logs
-mkdir -p /var/storage/meta
-mkdir -p /var/storage/sessions
-mkdir -p /var/storage/views
+# copy storage folders which must be writable to /var
+cp -r /opt/app/changedfiles/storage /var
 
 # Cleanup log files
 FILES="$(find /var/log -name '*.log')"
@@ -47,7 +44,14 @@ done
 # Ensure the paperwork database exists.
 echo "CREATE DATABASE IF NOT EXISTS paperwork DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; GRANT ALL PRIVILEGES ON paperwork.* TO 'paperwork'@'localhost' IDENTIFIED BY 'paperwork' WITH GRANT OPTION; FLUSH PRIVILEGES;" | mysql --user root --socket /var/run/mysqld/mysqld.sock
 # Run database migrations.
-time php /opt/app/frontend/artisan migrate --force
+time php /opt/app/paperwork/frontend/artisan migrate --force
+
+# Some files needed to be changed for ruinning Paperwork
+# on Sandstorm. We copy these in the repository
+/usr/bin/mysqladmin -u root password 'new-password'
+rm -rf /opt/app/paperwork/frontend/app/storage/setup
+cp /opt/app/changedfiles/db_settings /opt/app/paperwork/frontend/app/storage/db_settings
+cp /opt/app/changedfiles/paperwork_settings /opt/app/paperwork/frontend/app/storage/paperwork_settings
 
 # Start nginx.
 /usr/sbin/nginx -c /opt/app/.sandstorm/service-config/nginx.conf -g "daemon off;"