xnlogic 1.0.44 → 1.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc9d6daa9047e280f91635b1791a5d45a8664a82
-  data.tar.gz: 8f21975b102426927885585376876368cabdf14d
+  metadata.gz: 84b5eb356eaddf722ef1cce1d851f7c892f35561
+  data.tar.gz: 6da713831743b875aea35e9673f3d1e447059c4a
 SHA512:
-  metadata.gz: e390156be00d7ca2887ff8b2d271a469cfd878b897b85e816fadf69fead7d05207237399a51c78af657888aa5ec41b3ec1b8a1a55426d11474ed3822586c1800
-  data.tar.gz: 0a807a9761d9ae5e4a97097a9ef46b1b6b7e97f208e76799d560d212e9df1e4a46354307812a6ae7137b04982672f949f1ce147a206758bd74ef30773a5445d9
+  metadata.gz: 18c936bf236327c779fbd209c86f932f05869e6a3fa8ef797c0a536e0f8e0c456dd5f12fa70ffef4ee6cb18228e16e4826a7d68996b9769048bef2a39e28c0d8
+  data.tar.gz: b743bcb856da2b4dc7bd24a362b4e58e869050f98d6892ec28ccf3001431304e36413ce36febdf9e511fa0132727dbf682ad62bd19a98ac3660c501ed66975d6

data/lib/xnlogic/templates/vagrant/config/start.sh

@@ -56,7 +56,8 @@ trap 'terminator' SIGINT
 
 export RELOAD=true
 echo "starting torquebox"
-lsof -i :8080 -sTCP:listen | grep . || torquebox run -J "-Xmx1g -XX:MaxPermSize=128m -Ddatomic.objectCacheMax=128m" &> /dev/null  &
+export JAVA_OPTS="-server -XX:+UseCompressedOops -Xmx2g -XX:MaxPermSize=256m -Ddatomic.objectCacheMax=64m"
+lsof -i :8080 -sTCP:listen | grep . || torquebox run &> /dev/null  &
 echo "Hit Ctrl+C to terminate"
 # Using cat to keep processes live
 cat

data/lib/xnlogic/templates/vagrant/config/vagrant.provision.tt

@@ -14,7 +14,7 @@ silent() {
   fi
 }
 hr() {
-printf "%$(tput cols)s\n"|tr " " "-"
+  printf "%$(tput cols)s\n"|tr " " "-"
 }
 
 hr
@@ -73,18 +73,32 @@ if [ -d $HOME/$XN_CLIENT/assets ]; then
   fi
 fi
 
-## Uncomment to upgrade Datomic
-# script/install_transactor.sh
+sudo apt-get install -y dos2unix
 
+<% if config[:datomic_mysql] -%>
 hr
-echo "Starting Datomic Service"
+echo "Installing and configuring MySQL"
+sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password password password'
+sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password password'
+silent sudo apt-get install -y mysql-server
+cd $HOME/$XN_CLIENT
+mysql -uroot -ppassword < config/mysql/db.sql
+mysql -uroot -ppassword < config/mysql/user.sql
+mysql -uroot -ppassword datomic < config/mysql/table.sql
+cd -
+<% end -%>
+
 hr
+echo "Configuring Datomic Service"
 sudo rm -f /etc/init/datomic.conf
 sudo cp $HOME/$XN_CLIENT/config/datomic.conf /etc/init/datomic.conf
 sudo initctl reload-configuration
-sudo service datomic restart
+dos2unix $HOME/$XN_CLIENT/script/install_transactor.sh
+chmod +x $HOME/$XN_CLIENT/script/install_transactor.sh
+$HOME/$XN_CLIENT/script/install_transactor.sh
+
+
 
-hr
 
 SERVER_START_SCRIPT="$HOME/$XN_CLIENT/config/start.sh"
 
@@ -98,7 +112,6 @@ echo "alias gs='git status'" >> ~/.zshrc
 echo "alias gd='git diff -w'" >> ~/.zshrc
 echo "alias gdc='git diff -w --cached'" >> ~/.zshrc
 
-sudo apt-get install -y dos2unix
 
 git config --global --add alias.co "checkout"
 git config --global --add alias.ci "commit"
@@ -128,31 +141,11 @@ fi
 
 hr
 echo "Configuring nginx"
-sudo apt-get install -y nginx
+silent sudo apt-get install -y nginx
 sudo rm -rf /etc/nginx/sites-enabled/default
 sudo cp $HOME/$XN_CLIENT/config/xnlogic.conf /etc/nginx/sites-enabled/xnlogic.conf
 sudo service nginx restart 
 
-<% if config[:datomic_pro] -%>
-hr
-echo "Upgrading to Datomic Pro transactor"
-chmod +x $HOME/$XN_CLIENT/script/install_transactor.sh
-$HOME/$XN_CLIENT/script/install_transactor.sh
-<% end -%>
-
-<% if config[:datomic_mysql] -%>
-hr
-echo "Installing and configuring MySQL"
-sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password password password'
-sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password password'
-sudo apt-get install -y mysql-server
-cd $HOME/$XN_CLIENT
-mysql -uroot -ppassword < config/mysql/db.sql
-mysql -uroot -ppassword < config/mysql/user.sql
-mysql -uroot -ppassword datomic < config/mysql/table.sql
-cd -
-<% end -%>
-
 hr
 echo "Done!"
 echo "--------------------------------------------------------"

data/lib/xnlogic/templates/vagrant/config/vagrant.up.tt

@@ -8,7 +8,7 @@ silent() {
   fi
 }
 hr() {
-printf "%$(tput cols)s\n"|tr " " "-"
+  printf "%$(tput cols)s\n"|tr " " "-"
 }
 
 export XN_CLIENT=<%= config[:name] %>

data/lib/xnlogic/templates/vagrant/datomic/install_free_transactor.sh.tt

@@ -3,9 +3,10 @@
 echo "Installing Datomic Free <%= config[:datomic_version] %> Transactor"
 cd $HOME
 wget https://my.datomic.com/downloads/free/<%=config[:datomic_version]%> --quiet -O datomic.zip
-unzip datomic.zip
+unzip -o datomic.zip
 rm datomic.zip
-sudo mv datomic-free-<%= config[:datomic_version] %> /usr/local/lib/datomic
+sudo rm -r /opt/datomic/datomic-free-<%=config[:datomic_version]%>
+sudo mv datomic-free-<%=config[:datomic_version]%> /opt/datomic
 sudo mkdir -p /opt/datomic
 sudo chown vagrant:vagrant /opt/datomic
 mv datomic-free-<%=config[:datomic_version]%> /opt/datomic

data/lib/xnlogic/templates/vagrant/datomic/install_pro_transactor.sh.tt

@@ -3,11 +3,12 @@
 echo "Installing Datomic Pro <%=config[:datomic_version]%> Transactor"
 cd $HOME
 wget --http-user=<%=config[:datomic_username]%> --http-password=<%=config[:datomic_key]%> https://my.datomic.com/repo/com/datomic/datomic-pro/<%=config[:datomic_version]%>/datomic-pro-<%=config[:datomic_version]%>.zip -O datomic.zip
-unzip datomic.zip
+unzip -o datomic.zip
 rm datomic.zip
 sudo mkdir -p /opt/datomic
 sudo chown vagrant:vagrant /opt/datomic
-mv datomic-pro-<%=config[:datomic_version]%> /opt/datomic
+sudo rm -r /opt/datomic/datomic-pro-<%=config[:datomic_version]%>
+sudo mv datomic-pro-<%=config[:datomic_version]%> /opt/datomic
 sudo mkdir -p /etc/datomic
 sudo rm -f /etc/datomic/transactor.properties
 sudo ln -s $HOME/$XN_CLIENT/config/transactor.properties /etc/datomic/transactor.properties

data/lib/xnlogic/version.rb

@@ -1,3 +1,3 @@
 module Xnlogic
-  VERSION = "1.0.44"
+  VERSION = "1.0.45"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.44
+  version: 1.0.45
 platform: ruby
 authors:
 - Darrick Wiebe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor