xnlogic 1.0.31 → 1.0.32

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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/xnlogic/cli/application.rb +5 -0
  3. data/lib/xnlogic/templates/application/assets/images/xnlogic-logo-site-x2.png +0 -0
  4. data/lib/xnlogic/templates/application/assets/images/xnlogic-logo-site.png +0 -0
  5. data/lib/xnlogic/templates/application/assets/index.html.tt +27 -0
  6. data/lib/xnlogic/templates/vagrant/config/datomic.conf +13 -11
  7. data/lib/xnlogic/templates/vagrant/config/vagrant.provision.tt +7 -0
  8. data/lib/xnlogic/templates/vagrant/config/xnlogic.conf.tt +40 -0
  9. data/lib/xnlogic/version.rb +1 -1
  10. metadata +6 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 63a680939c6cb2880c95ba53fd9c14a7405fe160
4
- data.tar.gz: a0b2d463ea996e26e0daaae40bbb887ffef87211
3
+ metadata.gz: c669d10588ce880f6b3cae84899617d2575be19e
4
+ data.tar.gz: 1729e6912092335730eec4719a2ddc174bfe9bed
5
5
  SHA512:
6
- metadata.gz: e6b21a2896f39517c199227da3737a95a9d6290cb1a871bbf71765749880b47a7ed32b0c06a4685981bdecca81b317b8e17acbba81c239f431f0fdc0b7a38da3
7
- data.tar.gz: 8fd86dd410f91a5e78e3dde527024acbf59a59aec28b137b504f2c1a162658dbfbf469c773b09152dbc655613b76a7503d41820d5695317d7ac738682d005024
6
+ metadata.gz: 3b4a88a090f82fe8341dc748433550243bfe7a675d4ce116fd312463b28c88eb01abd7670809f1a0442c17d2a243c779cd6b986f06c946752b9bf428354d8256
7
+ data.tar.gz: 413ce09d9ea88ce8d171fb06444aebb6441a0945e41ae1a23f943ed0a520e7e70dddd2b43bfbb96e59dff69c14a2826e465c7c27e8e2d020c50f6303009614ee
data/lib/xnlogic/cli/application.rb CHANGED
@@ -128,6 +128,7 @@ module Xnlogic
128
128
  templates = {
129
129
  "Gemfile.tt" => "Gemfile",
130
130
  "config/vagrant.provision.tt" => "config/vagrant.provision",
131
+ "config/xnlogic.conf.tt" => "config/xnlogic.conf",
131
132
  }
132
133
  _generate_templates(templates, 'vagrant', template_options, 'Updating configuration')
133
134
 
@@ -175,6 +176,7 @@ module Xnlogic
175
176
  "config/datomic.conf" => "config/datomic.conf",
176
177
  "config/start.sh" => "config/start.sh",
177
178
  "config/transactor.properties" => "config/transactor.properties",
179
+ "config/xnlogic.conf.tt" => "config/xnlogic.conf",
178
180
  }
179
181
 
180
182
  _generate_templates(base_templates, 'vagrant', template_options, 'Creating Vagrant configuration')
@@ -206,6 +208,9 @@ module Xnlogic
206
208
  "lib/gemname/permissions.rb.tt" => "lib/#{namespaced_path}/permissions.rb",
207
209
  "lib/gemname/type.rb.tt" => "lib/#{namespaced_path}/type.rb",
208
210
  "lib/fixtures/sample_fixtures.rb.tt" => "lib/fixtures/sample_fixtures.rb",
211
+ "assets/index.html.tt" => "assets/index.html",
212
+ "assets/images/xnlogic-logo-site.png" => "assets/images/xnlogic-logo-site.png",
213
+ "assets/images/xnlogic-logo-site-x2.png" => "assets/images/xnlogic-logo-site-x2.png",
209
214
 
210
215
  "spec/spec_helper.rb.tt" => "spec/spec_helper.rb",
211
216
  "spec/gemname/gemname_spec.rb.tt" => "spec/#{namespaced_path}/#{name}_spec.rb",
data/lib/xnlogic/templates/application/assets/index.html.tt ADDED
@@ -0,0 +1,27 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <title>Welcome to <%= config[:name] %> on xnlogic!</title>
5
+ <style>
6
+ body {
7
+ width: 35em;
8
+ margin: 0 auto;
9
+ font-family: Tahoma, Verdana, Arial, sans-serif;
10
+ }
11
+ </style>
12
+ </head>
13
+ <body>
14
+ <img src="images/xnlogic-logo-site-x2.png" />
15
+ <h1>Welcome to <%= config[:name] %> on xnlogic!</h1>
16
+ <p>If you see this page, the xnlogic web server is successfully installed and
17
+ working. Further configuration is required, please follow the <a href="http://xnlogic.github.io/getting_started">xnlogic Getting Started guide</a>.</p>
18
+
19
+ <p>For online documentation and support please refer to
20
+ <a href="http://github.com/xnlogic/xnlogic/wiki">xnlogic Wiki</a>.<br/>
21
+ Commercial support is available at
22
+ <a href="http://xnlogic.com/">xnlogic.com</a>.</p>
23
+
24
+ <p><em>Thank you for using xnlogic.</em></p>
25
+ </body>
26
+ </html>
27
+
data/lib/xnlogic/templates/vagrant/config/datomic.conf CHANGED
@@ -10,18 +10,22 @@
10
10
  env PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:$PATH
11
11
  env HOME=/opt/xn_apps
12
12
  env DAEMON=/usr/local/lib/datomic/bin/transactor
13
- env DAEMON_OPTS=/etc/datomic/transactor.properties
14
- env NAME=transactor
13
+ # If you want custom Xmx or Xms values, set them before the property file like so:
14
+ #env DAEMON_OPTS='-Xmx4g /etc/datomic/transactor.properties'
15
+ env DAEMON_OPTS='/etc/datomic/transactor.properties'
15
16
  env DESC=DatomicTransactor
16
17
  env APPDIR=/opt/xn_apps
17
- env PIDFILE=/opt/xn_apps/datomic.upstart.pid
18
- env DAEMONUSER=vagrant
19
18
 
20
- exec test -x $DAEMON || exit 1
19
+ env enabled=1
20
+
21
+ setuid root
22
+ setgid root
23
+
24
+ exec test -x $DAEMON || echo "$DESC Already running" && exit 1
21
25
  description "$DESC"
22
26
 
23
- start on runlevel [2345]
24
- stop on runlevel [!2345]
27
+ start on started networking
28
+ stop on stopping networking
25
29
 
26
30
  respawn
27
31
  respawn limit 10 5
@@ -32,8 +36,6 @@ pre-start script
32
36
  fi
33
37
  end script
34
38
 
35
- exec start-stop-daemon --start -c $DAEMONUSER -m -p $PIDFILE --exec $DAEMON $DAEMON_OPTS
36
-
37
- post-stop script
38
- rm -f $PIDFILE
39
+ script
40
+ $DAEMON $DAEMON_OPTS >> /var/log/datomic.log 2>&1
39
41
  end script
data/lib/xnlogic/templates/vagrant/config/vagrant.provision.tt CHANGED
@@ -119,6 +119,13 @@ if [ -x $PROVISION_APPS ]; then
119
119
  cd -
120
120
  fi
121
121
 
122
+ hr
123
+ echo "Configuring nginx"
124
+ sudo apt-get install -y nginx
125
+ sudo rm -rf /etc/nginx/sites-enabled/default
126
+ sudo cp $HOME/$XN_CLIENT/config/xnlogic.conf /etc/nginx/sites-enabled/xnlogic.conf
127
+ sudo service nginx restart
128
+
122
129
  hr
123
130
  echo "Done!"
124
131
  echo "--------------------------------------------------------"
data/lib/xnlogic/templates/vagrant/config/xnlogic.conf.tt ADDED
@@ -0,0 +1,40 @@
1
+ server {
2
+ listen 80 default_server;
3
+
4
+ client_max_body_size 10m;
5
+ client_body_buffer_size 128k;
6
+ proxy_connect_timeout 90;
7
+ proxy_send_timeout 90;
8
+ proxy_read_timeout 90;
9
+ proxy_buffers 32 4k;
10
+ proxy_http_version 1.0;
11
+
12
+ proxy_set_header Host $host;
13
+ proxy_set_header X-Real-IP $remote_addr;
14
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
15
+
16
+ access_log /var/log/nginx/http_app.xnlogic.com.access.log;
17
+ error_log /var/log/nginx/http_app.xnlogic.com.error.log;
18
+
19
+ location / {
20
+ proxy_pass http://localhost:8080;
21
+ proxy_read_timeout 90;
22
+
23
+ }
24
+
25
+ location ~ ^/assets/ {
26
+ root /home/vagrant/<%= config[:name] %>/;
27
+ gzip_http_version 1.0; # Required for CloudFront
28
+ gzip_proxied any; # Required for CloudFront
29
+ gzip_static on; # to serve pre-gzipped version
30
+ expires 365d;
31
+ add_header Cache-Control public;
32
+ add_header ETag "";
33
+
34
+ # CORS headers
35
+ add_header 'Access-Control-Allow-Origin' '*.xnlogic.com';
36
+ add_header 'Access-Control-Allow-Credentials' 'true';
37
+ add_header 'Access-Control-Allow-Methods' 'GET';
38
+ add_header 'Access-Control-Allow-Headers' 'DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
39
+ }
40
+ }
data/lib/xnlogic/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Xnlogic
2
- VERSION = "1.0.31"
2
+ VERSION = "1.0.32"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: xnlogic
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.31
4
+ version: 1.0.32
5
5
  platform: ruby
6
6
  authors:
7
7
  - Darrick Wiebe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-03 00:00:00.000000000 Z
11
+ date: 2015-03-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -106,6 +106,9 @@ files:
106
106
  - lib/xnlogic/templates/application/.rspec.tt
107
107
  - lib/xnlogic/templates/application/Rakefile.tt
108
108
  - lib/xnlogic/templates/application/Readme.md.tt
109
+ - lib/xnlogic/templates/application/assets/images/xnlogic-logo-site-x2.png
110
+ - lib/xnlogic/templates/application/assets/images/xnlogic-logo-site.png
111
+ - lib/xnlogic/templates/application/assets/index.html.tt
109
112
  - lib/xnlogic/templates/application/config.ru.tt
110
113
  - lib/xnlogic/templates/application/dev/console.rb.tt
111
114
  - lib/xnlogic/templates/application/gemspec.tt
@@ -134,6 +137,7 @@ files:
134
137
  - lib/xnlogic/templates/vagrant/config/start.sh
135
138
  - lib/xnlogic/templates/vagrant/config/transactor.properties
136
139
  - lib/xnlogic/templates/vagrant/config/vagrant.provision.tt
140
+ - lib/xnlogic/templates/vagrant/config/xnlogic.conf.tt
137
141
  - lib/xnlogic/ui.rb
138
142
  - lib/xnlogic/ui/shell.rb
139
143
  - lib/xnlogic/ui/silent.rb