xnlogic 1.0.44 → 1.0.45

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/lib/xnlogic/templates/vagrant/config/start.sh +2 -1
  3. data/lib/xnlogic/templates/vagrant/config/vagrant.provision.tt +21 -28
  4. data/lib/xnlogic/templates/vagrant/config/vagrant.up.tt +1 -1
  5. data/lib/xnlogic/templates/vagrant/datomic/install_free_transactor.sh.tt +3 -2
  6. data/lib/xnlogic/templates/vagrant/datomic/install_pro_transactor.sh.tt +3 -2
  7. data/lib/xnlogic/version.rb +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: dc9d6daa9047e280f91635b1791a5d45a8664a82
4
- data.tar.gz: 8f21975b102426927885585376876368cabdf14d
3
+ metadata.gz: 84b5eb356eaddf722ef1cce1d851f7c892f35561
4
+ data.tar.gz: 6da713831743b875aea35e9673f3d1e447059c4a
5
5
  SHA512:
6
- metadata.gz: e390156be00d7ca2887ff8b2d271a469cfd878b897b85e816fadf69fead7d05207237399a51c78af657888aa5ec41b3ec1b8a1a55426d11474ed3822586c1800
7
- data.tar.gz: 0a807a9761d9ae5e4a97097a9ef46b1b6b7e97f208e76799d560d212e9df1e4a46354307812a6ae7137b04982672f949f1ce147a206758bd74ef30773a5445d9
6
+ metadata.gz: 18c936bf236327c779fbd209c86f932f05869e6a3fa8ef797c0a536e0f8e0c456dd5f12fa70ffef4ee6cb18228e16e4826a7d68996b9769048bef2a39e28c0d8
7
+ data.tar.gz: b743bcb856da2b4dc7bd24a362b4e58e869050f98d6892ec28ccf3001431304e36413ce36febdf9e511fa0132727dbf682ad62bd19a98ac3660c501ed66975d6
data/lib/xnlogic/templates/vagrant/config/start.sh CHANGED
@@ -56,7 +56,8 @@ trap 'terminator' SIGINT
56
56
 
57
57
  export RELOAD=true
58
58
  echo "starting torquebox"
59
- lsof -i :8080 -sTCP:listen | grep . || torquebox run -J "-Xmx1g -XX:MaxPermSize=128m -Ddatomic.objectCacheMax=128m" &> /dev/null &
59
+ export JAVA_OPTS="-server -XX:+UseCompressedOops -Xmx2g -XX:MaxPermSize=256m -Ddatomic.objectCacheMax=64m"
60
+ lsof -i :8080 -sTCP:listen | grep . || torquebox run &> /dev/null &
60
61
  echo "Hit Ctrl+C to terminate"
61
62
  # Using cat to keep processes live
62
63
  cat
data/lib/xnlogic/templates/vagrant/config/vagrant.provision.tt CHANGED
@@ -14,7 +14,7 @@ silent() {
14
14
  fi
15
15
  }
16
16
  hr() {
17
- printf "%$(tput cols)s\n"|tr " " "-"
17
+ printf "%$(tput cols)s\n"|tr " " "-"
18
18
  }
19
19
 
20
20
  hr
@@ -73,18 +73,32 @@ if [ -d $HOME/$XN_CLIENT/assets ]; then
73
73
  fi
74
74
  fi
75
75
 
76
- ## Uncomment to upgrade Datomic
77
- # script/install_transactor.sh
76
+ sudo apt-get install -y dos2unix
78
77
 
78
+ <% if config[:datomic_mysql] -%>
79
79
  hr
80
- echo "Starting Datomic Service"
80
+ echo "Installing and configuring MySQL"
81
+ sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password password password'
82
+ sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password password'
83
+ silent sudo apt-get install -y mysql-server
84
+ cd $HOME/$XN_CLIENT
85
+ mysql -uroot -ppassword < config/mysql/db.sql
86
+ mysql -uroot -ppassword < config/mysql/user.sql
87
+ mysql -uroot -ppassword datomic < config/mysql/table.sql
88
+ cd -
89
+ <% end -%>
90
+
81
91
  hr
92
+ echo "Configuring Datomic Service"
82
93
  sudo rm -f /etc/init/datomic.conf
83
94
  sudo cp $HOME/$XN_CLIENT/config/datomic.conf /etc/init/datomic.conf
84
95
  sudo initctl reload-configuration
85
- sudo service datomic restart
96
+ dos2unix $HOME/$XN_CLIENT/script/install_transactor.sh
97
+ chmod +x $HOME/$XN_CLIENT/script/install_transactor.sh
98
+ $HOME/$XN_CLIENT/script/install_transactor.sh
99
+
100
+
86
101
 
87
- hr
88
102
 
89
103
  SERVER_START_SCRIPT="$HOME/$XN_CLIENT/config/start.sh"
90
104
 
@@ -98,7 +112,6 @@ echo "alias gs='git status'" >> ~/.zshrc
98
112
  echo "alias gd='git diff -w'" >> ~/.zshrc
99
113
  echo "alias gdc='git diff -w --cached'" >> ~/.zshrc
100
114
 
101
- sudo apt-get install -y dos2unix
102
115
 
103
116
  git config --global --add alias.co "checkout"
104
117
  git config --global --add alias.ci "commit"
@@ -128,31 +141,11 @@ fi
128
141
 
129
142
  hr
130
143
  echo "Configuring nginx"
131
- sudo apt-get install -y nginx
144
+ silent sudo apt-get install -y nginx
132
145
  sudo rm -rf /etc/nginx/sites-enabled/default
133
146
  sudo cp $HOME/$XN_CLIENT/config/xnlogic.conf /etc/nginx/sites-enabled/xnlogic.conf
134
147
  sudo service nginx restart
135
148
 
136
- <% if config[:datomic_pro] -%>
137
- hr
138
- echo "Upgrading to Datomic Pro transactor"
139
- chmod +x $HOME/$XN_CLIENT/script/install_transactor.sh
140
- $HOME/$XN_CLIENT/script/install_transactor.sh
141
- <% end -%>
142
-
143
- <% if config[:datomic_mysql] -%>
144
- hr
145
- echo "Installing and configuring MySQL"
146
- sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password password password'
147
- sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password password'
148
- sudo apt-get install -y mysql-server
149
- cd $HOME/$XN_CLIENT
150
- mysql -uroot -ppassword < config/mysql/db.sql
151
- mysql -uroot -ppassword < config/mysql/user.sql
152
- mysql -uroot -ppassword datomic < config/mysql/table.sql
153
- cd -
154
- <% end -%>
155
-
156
149
  hr
157
150
  echo "Done!"
158
151
  echo "--------------------------------------------------------"
data/lib/xnlogic/templates/vagrant/config/vagrant.up.tt CHANGED
@@ -8,7 +8,7 @@ silent() {
8
8
  fi
9
9
  }
10
10
  hr() {
11
- printf "%$(tput cols)s\n"|tr " " "-"
11
+ printf "%$(tput cols)s\n"|tr " " "-"
12
12
  }
13
13
 
14
14
  export XN_CLIENT=<%= config[:name] %>
data/lib/xnlogic/templates/vagrant/datomic/install_free_transactor.sh.tt CHANGED
@@ -3,9 +3,10 @@
3
3
  echo "Installing Datomic Free <%= config[:datomic_version] %> Transactor"
4
4
  cd $HOME
5
5
  wget https://my.datomic.com/downloads/free/<%=config[:datomic_version]%> --quiet -O datomic.zip
6
- unzip datomic.zip
6
+ unzip -o datomic.zip
7
7
  rm datomic.zip
8
- sudo mv datomic-free-<%= config[:datomic_version] %> /usr/local/lib/datomic
8
+ sudo rm -r /opt/datomic/datomic-free-<%=config[:datomic_version]%>
9
+ sudo mv datomic-free-<%=config[:datomic_version]%> /opt/datomic
9
10
  sudo mkdir -p /opt/datomic
10
11
  sudo chown vagrant:vagrant /opt/datomic
11
12
  mv datomic-free-<%=config[:datomic_version]%> /opt/datomic
data/lib/xnlogic/templates/vagrant/datomic/install_pro_transactor.sh.tt CHANGED
@@ -3,11 +3,12 @@
3
3
  echo "Installing Datomic Pro <%=config[:datomic_version]%> Transactor"
4
4
  cd $HOME
5
5
  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
6
- unzip datomic.zip
6
+ unzip -o datomic.zip
7
7
  rm datomic.zip
8
8
  sudo mkdir -p /opt/datomic
9
9
  sudo chown vagrant:vagrant /opt/datomic
10
- mv datomic-pro-<%=config[:datomic_version]%> /opt/datomic
10
+ sudo rm -r /opt/datomic/datomic-pro-<%=config[:datomic_version]%>
11
+ sudo mv datomic-pro-<%=config[:datomic_version]%> /opt/datomic
11
12
  sudo mkdir -p /etc/datomic
12
13
  sudo rm -f /etc/datomic/transactor.properties
13
14
  sudo ln -s $HOME/$XN_CLIENT/config/transactor.properties /etc/datomic/transactor.properties
data/lib/xnlogic/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Xnlogic
2
- VERSION = "1.0.44"
2
+ VERSION = "1.0.45"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: xnlogic
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.44
4
+ version: 1.0.45
5
5
  platform: ruby
6
6
  authors:
7
7
  - Darrick Wiebe
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-04-13 00:00:00.000000000 Z
12
+ date: 2015-04-14 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: thor