xnlogic 1.0.40 → 1.0.41
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/xnlogic/cli/application.rb +5 -0
- data/lib/xnlogic/templates/vagrant/config/vagrant.provision.tt +22 -2
- data/lib/xnlogic/templates/vagrant/datomic/install_pro_transactor.sh.tt +2 -1
- data/lib/xnlogic/templates/vagrant/datomic/mysql/db.sql +11 -0
- data/lib/xnlogic/templates/vagrant/datomic/mysql/table.sql +14 -0
- data/lib/xnlogic/templates/vagrant/datomic/mysql/user.sql +6 -0
- data/lib/xnlogic/version.rb +1 -1
- metadata +4 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 02df4d7538957ec9c6e46168115b839087ae5001
|
4
|
+
data.tar.gz: 9bfda18788a609ea4ef566f445728aa26501a9b7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a5ec522bc8fad50dfc791c8048cc0d58af039b3eb892e0910012fb61e09087a3fbc2eee9c1f3b83cb2ae4043343b90681bd3bf66ea73a97a3f901d6389604df7
|
7
|
+
data.tar.gz: e4fceb73a3f926c6d662b1ee088cb692c58c1f6f1431cbc68097d894f8e28cf88814b834ab1d6b85bc9dcb7d4627bc0303b4f6292687c14cff00e6bea94eceb7
|
@@ -230,6 +230,11 @@ module Xnlogic
|
|
230
230
|
base_templates['datomic/m2_settings.xml.tt'] = 'config/m2_settings.xml'
|
231
231
|
base_templates['datomic/pom.xml.tt'] = 'config/pom.xml'
|
232
232
|
base_templates['datomic/get_datomic_jar.sh.tt'] = 'script/get_datomic_jar.sh'
|
233
|
+
if options['datomic_mysql']
|
234
|
+
base_templates['datomic/mysql/db.sql'] = 'config/mysql/db.sql'
|
235
|
+
base_templates['datomic/mysql/table.sql'] = 'config/mysql/table.sql'
|
236
|
+
base_templates['datomic/mysql/user.sql'] = 'config/mysql/user.sql'
|
237
|
+
end
|
233
238
|
end
|
234
239
|
|
235
240
|
_generate_templates(base_templates, 'vagrant', template_options, 'Creating Vagrant configuration')
|
@@ -107,8 +107,8 @@ git config --global --add alias.ignore "update-index --assume-unchanged"
|
|
107
107
|
git config --global --add alias.unignore "update-index --no-assume-unchanged"
|
108
108
|
git config --global --add alias.cp "cherry-pick"
|
109
109
|
git config --global --add alias.unadd "reset HEAD"
|
110
|
-
git config --global --add alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)
|
111
|
-
git config --global --add alias.lga "
|
110
|
+
git config --global --add alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)[%an]%Creset' --abbrev-commit"
|
111
|
+
git config --global --add alias.lga "lg --all"
|
112
112
|
git config --global --add alias.branches "submodule foreach 'git branch | grep \*'"
|
113
113
|
|
114
114
|
hr
|
@@ -133,6 +133,26 @@ sudo rm -rf /etc/nginx/sites-enabled/default
|
|
133
133
|
sudo cp $HOME/$XN_CLIENT/config/xnlogic.conf /etc/nginx/sites-enabled/xnlogic.conf
|
134
134
|
sudo service nginx restart
|
135
135
|
|
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
|
+
|
136
156
|
hr
|
137
157
|
echo "Done!"
|
138
158
|
echo "--------------------------------------------------------"
|
@@ -13,8 +13,9 @@ sudo rm -f /etc/datomic/transactor.properties
|
|
13
13
|
sudo ln -s $HOME/$XN_CLIENT/config/transactor.properties /etc/datomic/transactor.properties
|
14
14
|
<% if config[:datomic_mysql] -%>
|
15
15
|
wget http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.35.tar.gz -O mysql.tgz
|
16
|
-
tar -xvzf mysql.tgz
|
16
|
+
tar -xvzf mysql.tgz
|
17
17
|
sudo mv mysql-connector-java-5.1.35/*.jar /opt/datomic/datomic-pro-<%=config[:datomic_version]%>/lib
|
18
|
+
rm -r mysql-connector-java-5.1.35
|
18
19
|
rm mysql.tgz
|
19
20
|
<% end -%>
|
20
21
|
sudo service datomic stop
|
@@ -0,0 +1,11 @@
|
|
1
|
+
-- NOTE: Datomic does not ship with a MySql driver. To use these scripts, you must
|
2
|
+
-- download the driver from http://dev.mysql.com/downloads/connector/j/ and copy
|
3
|
+
-- the jar file into the lib directory of the transactor so that it is available
|
4
|
+
-- to the transactor. You must also ensure the jar is available on the classpath of
|
5
|
+
-- your peer application.
|
6
|
+
|
7
|
+
-- Database: datomic
|
8
|
+
|
9
|
+
-- DROP DATABASE datomic;
|
10
|
+
|
11
|
+
CREATE DATABASE datomic COLLATE 'binary';
|
@@ -0,0 +1,14 @@
|
|
1
|
+
-- NOTE: see mysql-db.sql for instructions on installing mysql driver
|
2
|
+
|
3
|
+
-- Table: datomic_kvs
|
4
|
+
|
5
|
+
-- DROP TABLE datomic_kvs;
|
6
|
+
|
7
|
+
CREATE TABLE datomic_kvs
|
8
|
+
(
|
9
|
+
id varchar(640) NOT NULL,
|
10
|
+
rev integer,
|
11
|
+
map text,
|
12
|
+
val longblob,
|
13
|
+
CONSTRAINT pk_id PRIMARY KEY (id)
|
14
|
+
) ENGINE=INNODB
|
data/lib/xnlogic/version.rb
CHANGED
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.
|
4
|
+
version: 1.0.41
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Darrick Wiebe
|
@@ -145,6 +145,9 @@ files:
|
|
145
145
|
- lib/xnlogic/templates/vagrant/datomic/install_pro_transactor.sh.tt
|
146
146
|
- lib/xnlogic/templates/vagrant/datomic/m2_settings.xml.tt
|
147
147
|
- lib/xnlogic/templates/vagrant/datomic/mysql.properties.tt
|
148
|
+
- lib/xnlogic/templates/vagrant/datomic/mysql/db.sql
|
149
|
+
- lib/xnlogic/templates/vagrant/datomic/mysql/table.sql
|
150
|
+
- lib/xnlogic/templates/vagrant/datomic/mysql/user.sql
|
148
151
|
- lib/xnlogic/templates/vagrant/datomic/pom.xml.tt
|
149
152
|
- lib/xnlogic/templates/vagrant/datomic/pro.properties.tt
|
150
153
|
- lib/xnlogic/ui.rb
|