fixingthenet-installer 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cef1f66f36fcf75fceeeaf5054e9f69b9340659e
-  data.tar.gz: 8a689e079f82a96a669363394266c135559732bf
+  metadata.gz: a19a2e2a1a4a47765b754a9f01735f1a93ccc9a7
+  data.tar.gz: 860eb0c3111e9266bfd981b28f74214f1320521e
 SHA512:
-  metadata.gz: d6ead90af49b3c5ed97ee0011e35f8316288099e2ec78e928cc909d46a40cfcc51fedd95cf48658a00cb1da8b56e74c64cf711c370f9559daae9029e7e8caa7b
-  data.tar.gz: 7afb6c3b520dd4e1c9e089e244da9ff96d2e838cd5048f936a40ea903f9f4a7cb428aed282224a4de5c18cfa99f059468a266c6f33c294ec75e5ca2571dc4463
+  metadata.gz: 20213ed78a5e3107134aafc2bb11360d9e92b6c8448727f1301d3b096f803976e87a9e718289c84811fd72740fdc3dc05c0278c56863cc3e73de453459a45d48
+  data.tar.gz: c912d848a0cae390e9676d8fe42ca2261c32921d46ba241c4903db0a3293c74b5989bebdf208b20d73fb21b561a7e78a13f1f7e2286fbbad88a1d691b69e03ce

data/bin/ftn

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__),"..","lib")) if $PROGRAMM_NAME='bin/ftn'
 
 require 'fixingthenet/installer'
 

data/lib/fixingthenet/installer.rb

@@ -14,11 +14,14 @@ module Fixingthenet
   module Installer
 
     TEMPLATES_DIR=Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), '..', '..','templates')))
-    NGINX_SITES_DIR=Pathname.new "/etc/nginx/sites-enabled/"
+    NGINX_APPS_DIR=Pathname.new "/etc/fixingthenet/nginx/apps"
+    NGINX_SITES_DIR=Pathname.new "/etc/nginx/sites-enabled"
+
     INITD_DIR=Pathname.new("/etc/init.d/")
 
     DEFAULT_OPTIONS = {:apps_root => Pathname.new('/vagrant/apps'),
                        :template_path => TEMPLATES_DIR,
+                       :nginx_apps_dir => NGINX_APPS_DIR,
                        :env => 'development',
                        :server_name => '192.168.40.10'
     }

data/lib/fixingthenet/installer/app.rb

@@ -11,6 +11,7 @@ module Fixingthenet
       def root
         apps_root.join(full_name)
       end
+
     end
 
   end

data/lib/fixingthenet/installer/command.rb

@@ -3,15 +3,16 @@ module Fixingthenet
     class Command
       attr_reader :args
       attr_reader :options
+      attr_reader :app
 
       def initialize(_options, args=[])
         @options=_options
         @args=args
         parse_options unless args.empty?
 
-        app=App.new(options)
+        @app=App.new(options)
         puts "options: #{options}" if options[:verbose]
-        command(app)
+        command
       end
 
       private

data/lib/fixingthenet/installer/install_command.rb

@@ -27,19 +27,26 @@ module Fixingthenet
         end.parse!(args)
       end
 
-      def command(app)
-        {app.template_path.join('nginx_app.conf.erb') => NGINX_SITES_DIR.join(app.full_name),
+      def command
+        # make sure the site exists
+        render(app.template_path.join('nginx_app.conf.erb'),NGINX_SITES_DIR.join("fixingthenet-#{app.server_name}"))
+
+        # install the location handler
+        {app.template_path.join('app.conf.erb') => NGINX_APPS_DIR.join(app.full_name),
          app.template_path.join('initd.conf.erb') => INITD_DIR.join(app.full_name)
         }.each do |template_name, destination|
-          template=File.read(template_name)
-          content=ERB.new(template).result(binding)
-          puts "#{template_name} -> #{destination}" if options[:verbose]
-          write_content(destination, content)
+          render(template_name, destination)
         end
 
         `sudo /etc/init.d/#{app.full_name} reload`
       end
 
+      def render(template_name, destination)
+        content=ERB.new(File.read(template_name)).result(binding)
+        puts "#{template_name} -> #{destination}" if options[:verbose]
+        write_content(destination, content)
+      end
+
       def write_content(file, content)
         File.open(file, "w") do |fd|
           fd.write content

data/lib/fixingthenet/installer/uninstall_command.rb

@@ -14,11 +14,11 @@ module Fixingthenet
         end.parse!(args)
       end
 
-      def command(app)
+      def command
         initd_filename="/etc/init.d/#{app.full_name}"
         `sudo #{initd_filename} stop` if File.exist?(initd_filename)
         [
-            NGINX_SITES_DIR.join(app.full_name),
+            NGINX_APPS_DIR.join(app.full_name),
             INITD_DIR.join(app.full_name)
 
         ].each do |destination|

data/lib/fixingthenet/installer/version.rb

@@ -1,5 +1,5 @@
 module Fixingthenet
   module Installer
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/templates/app.conf.erb

@@ -0,0 +1,6 @@
+  location <%= app.mount_path %> {
+    proxy_pass  http://localhost:<%= app.port %>;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
+    proxy_redirect off;
+  }

data/templates/nginx_app.conf.erb

@@ -1,23 +1,3 @@
-#map $http_upgrade $connection_upgrade {
-#    default upgrade;
-#    '' close;
-#}
-
-#upstream websocket {
-#    server localhost:<%= app.port %>;
-#}
-
-#server {
-#    listen 8020;
-#    location / {
-#        proxy_pass http://websocket;
-#        proxy_http_version 1.1;
-#        proxy_set_header Upgrade $http_upgrade;
-#        proxy_set_header Connection $connection_upgrade;
-#    }
-#}
-
-
 server {
   #listen       *:80 default_server;
   #server_name  _;
@@ -30,26 +10,5 @@ server {
   error_log /var/log/nginx/error.log;
 
 
-  location <%= app.mount_path %> {
-    proxy_pass  http://localhost:<%= app.port %>;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-  }
-
-
-#  location ~ ^<%= app.root_path %>(assets|system)/ {
-#    root <%= app.root %>/public;
-#    expires 1y;
-#    add_header Cache-Control public;
-#   gzip_static on;
-#    add_header ETag "";
-#    break;
-#  }
-
-
-#  location ~ ^/(robots\.txt|favicon\.ico|.*\.html).*$ {
-#    root <%= app.root %>/public;
-#  }
-
+  include <%= app.nginx_apps_dir %>/*;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixingthenet-installer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter Schrammel
 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: bundler
@@ -60,6 +60,7 @@ files:
 - lib/fixingthenet/installer/install_command.rb
 - lib/fixingthenet/installer/uninstall_command.rb
 - lib/fixingthenet/installer/version.rb
+- templates/app.conf.erb
 - templates/initd.conf.erb
 - templates/nginx_app.conf.erb
 homepage: https://github.com/fixingthenet/fixingthenet-installer