bard 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecbadd22fc4903fa9e779a515d0a7c9448392ac4fe2396ae2272bab7daeb4018
-  data.tar.gz: '068143adee00988e0506bb8e834ad5a15ebf65caf9e824d7a7f8e3923b9dbf18'
+  metadata.gz: bf24b5fc8c53912b9568bbba566570d1883ab489e7d72dd01869dd1efcdcea8e
+  data.tar.gz: 2b069ea15ef1dbc21beccd0c909eedae482909c1a4a3a22fe7eb2e88d765118d
 SHA512:
-  metadata.gz: b12423bf86e5978f48a4864c0572585aa583af33d1b1d6cdcdfb3e466b511d00e7e887908720346b6b13e7f09baa4948e511d717dbea34f72883a27385f58d6b
-  data.tar.gz: 73451d824a62f1f8953f83d89055e87355018aebbf0b92d05741e17391db204be01d594afcedd113bbb347f065a3e42ed3dffc387ebcb94118670e9ce08f0316
+  metadata.gz: 3ff5b076f3ef83cd1d1fbf9eec8a510b4b1c6fcde36b0a9f823e48b694d29d0804869c0520dcd04095ff9ec974463c214f11f9e342eef478c30adc5827b0a21a
+  data.tar.gz: 64477c11e3e15b746c892329c67fbcb7c33872e2cc58c13aa8aee1ce88ee09976a539704e7f2e7260936b7d38956731542fac34c8684ebdb55943dafa2a3764b

data/lib/bard/provision/apt.rb

@@ -0,0 +1,16 @@
+# apt sanity
+
+class Bard::Provision::Apt < Bard::Provision
+  def call
+    print "Apt:"
+    provision_server.run! [
+      %(echo "\\$nrconf{restart} = \\"a\\";" | sudo tee /etc/needrestart/conf.d/90-autorestart.conf),
+      "sudo apt-get update -y",
+      "sudo apt-get upgrade -y",
+      "sudo apt-get install -y curl",
+    ].join("; "), home: true
+
+    puts " ✓"
+  end
+end
+

data/lib/bard/provision/http.rb

@@ -4,25 +4,11 @@ class Bard::Provision::HTTP < Bard::Provision
   def call
     print "HTTP:"
     target_host = URI.parse(server.ping.first).host
-    if system "curl -s --resolve #{target_host}:80:#{provision_server.ssh_uri.host} http://#{target_host} -I | grep -i \"x-powered-by: phusion passenger\""
+    if system "curl -s --resolve #{target_host}:80:#{provision_server.ssh_uri.host} http://#{target_host} -I | grep -i \"x-powered-by: phusion passenger\" >/dev/null 2>&1"
       puts " ✓"
     else
       puts " !!! not serving a rails app from #{provision_server.ssh_uri.host}"
     end
   end
-  
-  private
-
-  def ssh_available? ssh_uri, port: ssh_uri.port
-    system "nc -zv #{ssh_uri.host} #{port} 2>/dev/null"
-  end
-
-  def ssh_known_host? ssh_uri
-    system "grep -q \"$(ssh-keyscan -t ed25519 -p#{ssh_uri.port || 22} #{ssh_uri.host} 2>/dev/null | cut -d ' ' -f 2-3)\" ~/.ssh/known_hosts"
-  end
-
-  def add_ssh_known_host! ssh_uri
-    system "ssh-keyscan -p#{ssh_uri.port || 22} -H #{ssh_uri.host} >> ~/.ssh/known_hosts"
-  end
 end
 

data/lib/bard/provision/mysql.rb

@@ -19,5 +19,3 @@ class Bard::Provision::MySQL < Bard::Provision
   end
 end
 
-
-

data/lib/bard/provision/passenger.rb

@@ -6,16 +6,14 @@ class Bard::Provision::Passenger < Bard::Provision
     if !http_responding?
       print " Installing nginx & Passenger,"
       provision_server.run! [
-        %(echo "\\$nrconf{restart} = \\"a\\";" | sudo tee /etc/needrestart/conf.d/90-autorestart.conf),
         %(grep -qxF "RAILS_ENV=production" /etc/environment || echo "RAILS_ENV=production" | sudo tee -a /etc/environment),
         %(grep -qxF "EDITOR=vim" /etc/environment || echo "EDITOR=vim" | sudo tee -a /etc/environment),
-        "sudo apt-get update -y",
-        "sudo apt-get upgrade -y",
-        "sudo apt-get install -y vim dirmngr gnupg apt-transport-https ca-certificates curl",
+        "sudo apt-get install -y vim dirmngr gnupg apt-transport-https ca-certificates",
         "curl https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/phusion.gpg >/dev/null",
         %(echo "deb https://oss-binaries.phusionpassenger.com/apt/passenger jammy main" | sudo tee /etc/apt/sources.list.d/passenger.list),
         "sudo apt-get update -y",
         "sudo apt-get install -y nginx libnginx-mod-http-passenger",
+        "sudo rm /etc/nginx/sites-enabled/default",
       ].join("; "), home: true
     end
 

data/lib/bard/provision/repo.rb

@@ -37,9 +37,9 @@ class Bard::Provision::Repo < Bard::Provision
     github_url = "git@github.com:botandrosedesign/#{project_name}"
     provision_server.run [
       "needle=$(ssh-keyscan -t ed25519 github.com 2>/dev/null | cut -d \" \" -f 2-3)",
-      "grep -q \"$needle\" ~/.ssh/known_hosts || ssh-keyscan -H github.com >> ~/.ssh/known_hosts",
+      "grep -q \"$needle\" ~/.ssh/known_hosts || ssh-keyscan -H github.com >> ~/.ssh/known_hosts 2>/dev/null",
       "git ls-remote #{github_url}",
-    ].join("; "), home: true
+    ].join("; "), home: true, quiet: true
   end
 
   def project_name

data/lib/bard/provision/rvm.rb

@@ -10,8 +10,9 @@ class Bard::Provision::RVM < Bard::Provision
         "gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB",
         "curl -sSL https://get.rvm.io | bash -s stable",
       ].join("; ")
-      print " Installing Ruby #{File.read(".ruby-version")},"
-      provision_server.run! "rvm install ."
+      version = File.read(".ruby-version").chomp
+      print " Installing Ruby #{version},"
+      provision_server.run! "rvm install #{version}"
     end
 
     puts " ✓"

data/lib/bard/provision/ssh.rb

@@ -5,16 +5,16 @@ class Bard::Provision::SSH < Bard::Provision
   def call
     print "SSH:"
 
-    if !ssh_available?(provision_server.ssh_uri, port: server.ssh_uri.port)
+    if !ssh_available?(provision_server.ssh_uri, port: target_port)
       if !ssh_available?(provision_server.ssh_uri)
-        raise "can't find SSH on port #{server.ssh_uri.port} or #{provision_server.ssh_uri.port}"
+        raise "can't find SSH on port #{target_port} or #{provision_server.ssh_uri.port || 22}"
       end
       if !ssh_known_host?(provision_server.ssh_uri)
         print " Adding known host,"
         add_ssh_known_host!(provision_server.ssh_uri)
       end
-      print " Reconfiguring port to #{server.ssh_uri.port},"
-      provision.server.run! %(echo "Port #{server.ssh_uri.port}" | sudo tee /etc/ssh/sshd_config.d/port_22022.conf; sudo service ssh restart), home: true
+      print " Reconfiguring port to #{target_port},"
+      provision_server.run! %(echo "Port #{target_port}" | sudo tee /etc/ssh/sshd_config.d/port_#{target_port}.conf; sudo service ssh restart), home: true
     end
 
     if !ssh_known_host?(provision_server.ssh_uri)
@@ -22,23 +22,30 @@ class Bard::Provision::SSH < Bard::Provision
       add_ssh_known_host!(provision_server.ssh_uri)
     end
 
-    # provision with new port from now on
+    # provision with new target port from now on
     ssh_url.gsub!(/:\d+$/, "")
-    ssh_url << ":#{server.ssh_uri.port}"
+    ssh_url << ":#{target_port}"
     puts " ✓"
   end
   
   private
 
-  def ssh_available? ssh_uri, port: ssh_uri.port
+  def target_port
+    server.ssh_uri.port || 22
+  end
+
+  def ssh_available? ssh_uri, port: nil
+    port ||= ssh_uri.port || 22
     system "nc -zv #{ssh_uri.host} #{port} 2>/dev/null"
   end
 
   def ssh_known_host? ssh_uri
-    system "grep -q \"$(ssh-keyscan -t ed25519 -p#{ssh_uri.port || 22} #{ssh_uri.host} 2>/dev/null | cut -d ' ' -f 2-3)\" ~/.ssh/known_hosts"
+    port ||= ssh_uri.port || 22
+    system "grep -q \"$(ssh-keyscan -t ed25519 -p#{port} #{ssh_uri.host} 2>/dev/null | cut -d ' ' -f 2-3)\" ~/.ssh/known_hosts"
   end
 
   def add_ssh_known_host! ssh_uri
-    system "ssh-keyscan -p#{ssh_uri.port || 22} -H #{ssh_uri.host} >> ~/.ssh/known_hosts"
+    port ||= ssh_uri.port || 22
+    system "ssh-keyscan -p#{port} -H #{ssh_uri.host} >> ~/.ssh/known_hosts 2>/dev/null"
   end
 end

data/lib/bard/provision/user.rb

@@ -16,6 +16,7 @@ class Bard::Provision::User < Bard::Provision
         "sudo mkdir -p ~#{new_user}/.ssh",
         "sudo cp ~/.ssh/authorized_keys ~#{new_user}/.ssh/authorized_keys",
         "sudo chown -R #{new_user}:#{new_user} ~#{new_user}/.ssh",
+        "sudo chmod +rx ~#{new_user}", # so nginx and passenger can read it
       ].join("; "), home: true
     end
 

data/lib/bard/provision.rb

@@ -5,6 +5,7 @@ module Bard
     def call
       SSH.call(*values)
       User.call(*values)
+      Apt.call(*values)
       MySQL.call(*values)
       Repo.call(*values)
       MasterKey.call(*values)
@@ -29,12 +30,13 @@ end
 
 require "bard/provision/ssh"
 require "bard/provision/user"
+require "bard/provision/apt"
 require "bard/provision/mysql"
-require "bard/provision/passenger"
 require "bard/provision/repo"
 require "bard/provision/master_key"
 require "bard/provision/rvm"
 require "bard/provision/app"
+require "bard/provision/passenger"
 require "bard/provision/data"
 require "bard/provision/http"
 

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Micah Geisel
@@ -146,6 +146,7 @@ files:
 - lib/bard/ping.rb
 - lib/bard/provision.rb
 - lib/bard/provision/app.rb
+- lib/bard/provision/apt.rb
 - lib/bard/provision/data.rb
 - lib/bard/provision/http.rb
 - lib/bard/provision/master_key.rb