Merge pull request #229 from goinvo/fermion/lightsail

Changes made moving the host to Lightsail.

.env.erb

@@ -7,4 +7,4 @@ AWS_ACCESS_KEY_ID=<%= `op read "op://StaffplanRedux/AWS_ACCESS_KEY_ID/credential
 AWS_SECRET_ACCESS_KEY=<%= `op read "op://StaffplanRedux/AWS_SECRET_ACCESS_KEY/credential"`.strip %>
 <% else raise ArgumentError, "Session token missing" end %>
 
-REDIS_URL=redis://159.203.142.226:6379/1
+REDIS_URL=redis://172.26.4.66:6379/1

app/views/layouts/application.html.erb

@@ -26,17 +26,17 @@
                 <div class="ml-10 flex items-baseline space-x-4">
                   <!-- Current: "bg-gray-900 text-white", Default: "text-gray-300 hover:bg-gray-700 hover:text-white" -->
                   <% if Rails.env.production? %>
-                    <a href="https://staffplan-ui.fermion.dev/people/<%= current_user.id %>" class="text-gray-300 hover:bg-gray-700 hover:text-white rounded-md px-3 py-2 text-sm font-medium">My StaffPlan</a>
+                    <a href="https://ui.staffplan.com/people/<%= current_user.id %>" class="text-gray-300 hover:bg-gray-700 hover:text-white rounded-md px-3 py-2 text-sm font-medium">My StaffPlan</a>
                   <% else %>
                     <%= header_link_to "My StaffPlan", "http://localhost:8080/people/#{current_user.id}" %>
                   <% end %>
                   <% if Rails.env.production? %>
-                    <a href="https://staffplan-ui.fermion.dev/projects" class="text-gray-300 hover:bg-gray-700 hover:text-white rounded-md px-3 py-2 text-sm font-medium">Projects</a>
+                    <a href="https://ui.staffplan.com/projects" class="text-gray-300 hover:bg-gray-700 hover:text-white rounded-md px-3 py-2 text-sm font-medium">Projects</a>
                   <% else %>
                     <%= header_link_to "Projects", "http://localhost:8080/projects" %>
                   <% end %>
                   <% if Rails.env.production? %>
-                    <a href="https://staffplan-ui.fermion.dev/people" class="text-gray-300 hover:bg-gray-700 hover:text-white rounded-md px-3 py-2 text-sm font-medium">People</a>
+                    <a href="https://ui.staffplan.com/people" class="text-gray-300 hover:bg-gray-700 hover:text-white rounded-md px-3 py-2 text-sm font-medium">People</a>
                   <% else %>
                     <%= header_link_to "People", "http://localhost:8080/people" %>
                   <% end %>
@@ -110,17 +110,17 @@
         <div class="border-b border-gray-700 md:hidden hidden" id="mobile-menu">
           <div class="space-y-1 px-2 py-3 sm:px-3">
             <% if Rails.env.production? %>
-              <a href="https://staffplan-ui.fermion.dev/people/<%= current_user.id  %>" class="text-gray-300 hover:bg-gray-700 hover:text-white block rounded-md px-3 py-2 text-base font-medium">My StaffPlan</a>
+              <a href="https://ui.staffplan.com/people/<%= current_user.id  %>" class="text-gray-300 hover:bg-gray-700 hover:text-white block rounded-md px-3 py-2 text-base font-medium">My StaffPlan</a>
             <% else %>
               <%= mobile_header_link_to "My StaffPlan", "http://localhost:8080/people/#{current_user.id}" %>
             <% end %>
             <% if Rails.env.production? %>
-              <a href="https://staffplan-ui.fermion.dev/projects" class="text-gray-300 hover:bg-gray-700 hover:text-white block rounded-md px-3 py-2 text-base font-medium">Projects</a>
+              <a href="https://ui.staffplan.com/projects" class="text-gray-300 hover:bg-gray-700 hover:text-white block rounded-md px-3 py-2 text-base font-medium">Projects</a>
             <% else %>
               <%= mobile_header_link_to "Projects", "http://localhost:8080/projects" %>
             <% end %>
             <% if Rails.env.production? %>
-              <a href="https://staffplan-ui.fermion.dev/people" class="text-gray-300 hover:bg-gray-700 hover:text-white block rounded-md px-3 py-2 text-base font-medium">People</a>
+              <a href="https://ui.staffplan.com/people" class="text-gray-300 hover:bg-gray-700 hover:text-white block rounded-md px-3 py-2 text-base font-medium">People</a>
             <% else %>
               <%= mobile_header_link_to "People", "http://localhost:8080/people" %>
             <% end %>

config/credentials/production.yml.enc

@@ -1 +1 @@
-0Mw6tx/Szcjc6flHoA6mP9Pet5xU2F2vGrlzDJxOtEIy4A8jTkTStx5c7TLNn1YogivfyDDLS4S1xAqcvgilSIfUw67Abdv9JdedjCj01OuhTSHl8TPw8acL5uK1KQ0m5u8TH74Xr0ra5tj5X+fBYyhRbbsV0PiFbgACUzXxykyK+4iK+rbqe73o2VMFfxgVyAZzmNYMtPQilGrfUf+A/hzFcbQxOsly+yjZUkb0bb7ZydX2PxQJ9WVa3xa2TFMfrZfXojKZ1coaamBI1t5MXIksOjmOcHOWinRAtfueUiAQT/AHzFs3lAuuooI2pfiPMW0eE9oSsPiuZDLrqtFpAZyV894TyuEdxWqJwOsQMTwfJZhLbwOKIBrjsN/m1c4h+de1ZC+c10RSoAOu4Kr5kfvcLbT5lJHWzxW26gy1ps/qZaWii7d0wN3+keEDlKUJFp4N68VgCHQqZS00WrfbxskuHwpGUoGP6Ziye6aKx7JZXGmluJ+7B+e9LSTrIBQ/ESVN09ZCXMdp4ikAbGRpER4du/+YQM641VEkb/lddLPVafNlgonAOmZQEy5nogvu7xduOz3qR0rz0umz2saLmI6uzRnrLqq+QCcb/LKxYKQIvc3jHp/+rOuvd2B3fhutiRSmbjlIvIa96nJwCkIGBvaGQXLN0CrNS6+/sptZ5oFhtt85RQPNgyHaa7adxPQLmyNRvfJ23OXZR27T3U6+gpfi4Fe/Y65ErnSXrUl6Mf8BW4Q1nE+mctiHP0OblAYZhaUEZcA/bYO7fPVtDCs4mmoQSQU8dB6wd3Hvv30ZtVtzr4lG+n3IFs9yKGhbRl6ZMsRBEMaLAzM1VJkv10Pj6A9mUZqFRqwe6nToItO/aikmTRGyaH4kLnx+6JMYfQmXZeRq7LPLH/K4Y09zpBMoYenzJvUKtZa9kWOX9jzon4ZvKdgYzL6sA7FhQVOKFp61VIVFj0EMzHXc2YfYeQt/hqeUSJdIulrtzfINGeZZWHftUg6zSVBSdLLk6qEn3Kz+V8Ua3yeTj4oPc2FF2AgS/nsk1UfXVmUyaEvME4tsWVcMrtFmvvsjfdt5WMbiBx+K70dKRb0lWJN8hsNdOyA9rLChRFhTr17RyZKCPj5h8eRxRtQwK9pse0a6Tvg5mDiOBmZF+RbU96F3Cwy3e+p5rl9qFL5RwuQ85k/81bjsDh6gJNYaUwjlRFcTjxPU2DU4TAoY9Fs1uxarPlERv5K3AUyj1HftJbz71pWn3vVhqNWc/VkXG22u0y3glPPvUmnlfUBlhDJBXhGqfjcdKZtbcfYurn5TpIO8wlekMG881iJUb4zASQaSfpuQiGT7wT/aQkUh1lQzMX345ynl9qw3VlaAqUPMGw7bzp/dqucsFR41X3QK8jjPUZN9HWhQxSt2+lMm5V0svQAvhfeVA7uCN0W/Qg2QVLLNhus/DG5R0sz4/0vnW8ZVzDXqjqgT8JbU2fWbpmXz2eEGwq40sZ/Qh/2m/Cs3wQAGPlLN7ibP6xWye2hmnbD7u2HmUzUDrDSGiBISQOolEjLfL1VrwufoENqAAyW/sU0EbZeFsr5AacBDgoabJUYRDVXQmWbU3O/Oomc59c+r2VdfvzjFz31F/Xk6hoeHR9R0+HYzte27sc75Cd0eJlLisFbNJW+t6N/WIlT7inLFNYSHH8FPgqKFdiE=--bC5siEBFpJaPs6/k--mr/BbWj+EbHQ9Orqf2Mihg==
+em7jzyOn8v4JFWr5ja4yecv+mEz0iGxu2ek6G6l6kBI/Jb4QzwRvTKIhoigR2TdUPIJonPuNbzf+B67ibekDCxnorfghicuFVLWcD9Ho/USegQZhVs0HQYQhw75IS2q3KY6X7gomNAanMqQuq1I26bs+fsnpRJ6TU99k5jTidzhocQ211fkKIjP4HgWKcDE+DXFBSvdqpeKvX6KCX3EQeqcW3Chh5+7qmkKfj+bTzZL2Rot2GutGxknaMyAj6s8tH9yF5rhQVe3tuZAuYCFEo/Pz50/QNV2cCUBFV78IGehRTG0oCLRkY7WJVmT+QrlJSPR07HYXfz/ABoHQwQrRQMNdHc+Gc6VTnLyucQawRML7w04RjbHKwaMuphfXvqkOfX2//pSRiMh+6jgm26C3qQG+ZJT0X3gFmNnDxGMyudz7sQr64ZL0t2Zjde/Xp0k8PU6MKuTd44hhsxcjKcnxCNikRIdOzIuxMWpHEuQEX+rKDR1mtC2Fr9x5BhM5wUYMNLqGa9wxYsVHTLYVrfr9NyVbc6qODKfv/BOxKBHV5eNg5Z2Tr3j//V1j7XomNUGl7b+DBLIuGkIKcXJZhhDvJqeObDWrQFsyTPkQE5/lG+sxZeyr2vIZq7FOLGYohOWLGYjmBSxTXgKmUB2FXbWszDothlBLHNKVocenxfnMCnFlhtzNQzV5emHq4VwOQfmhG3Yo3nTCIvYqrNEMRKjvctuxWgBwgrx8KvyatAz1EUKoSWrsbq5cWZs4T8OGXqtP8BQ9zuh45jS+smj/rR/miumCrX240YJhaouj31tJmWSt4I0MvOTFlXo1pgPFJ/8rv7gdNOr7PMYzNOq5hJPvvkn4WctFNfDmcMEGbcnRBstLIF5x/9cSsN3li7mxUYWist0ZCALNT6im4UsI8ONYJDM4CptSYihL5CvnsiKPjZCFFtHcm+d3/LXoLpkGO5/XyFh9Ge8h+CmEkQlXmrBIkiTqt4gYGqvl3DP4kYZr6WabBfvmhgusYxjvMkIOTdQDMggTwhSv8yuUhmqdkJgVPrHatPMpxg7wtCZFjBsss/+bRAxo/hyD8PWn28lF2Ee8ixtDheLbSbHS4a8HknvkJnMX4JvlRXKU25WYn+VzKROYKC5HKVXdNO06rDx2vWGGQtMUfA1pkFK3aiYxyPa0RW86BqoKqWn2wxC9+lD7cc2tc3moVJgUrnHW3bDJTpNf3ip4PgJnyLhlnkTLsC6h9glMdo5pWLy4bfvN3BqnjKvp5Smw+Hssm9z+NvN9/HHxKPTjvxJDh4kyIjChVw3J+dlLBHKxeFVylvH87+g5FWMvJrQIRStXOOY=--gFLFbWAnFyZrMK5a--vcbWU38iCOm4yiNU8cWTbQ==

config/database.yml

@@ -85,7 +85,7 @@ test:
 #
 production:
   <<: *default
-  host: 159.203.142.226
+  host: 172.26.4.66
   database: staffplan_redux_production
   username: staffplan_redux
   password: <%= ENV["POSTGRES_PASSWORD"] %>

config/deploy.yml

@@ -8,13 +8,13 @@ image: fermion/staffplan-redux
 servers:
   web:
     hosts:
-      - 159.203.142.226
+      - 34.192.107.71
     cmd: bundle exec puma -C config/puma.rb
     options:
       "add-host": host.docker.internal:host-gateway
   job:
     hosts:
-      - 159.203.142.226
+      - 34.192.107.71
     cmd: bundle exec sidekiq -C config/sidekiq.yml
     options:
       "add-host": host.docker.internal:host-gateway
@@ -29,7 +29,7 @@ registry:
 # Remember to run `kamal env push` after making changes!
 env:
   clear:
-    DB_HOST: 159.203.142.226
+    DB_HOST: 34.192.107.71
   secret:
     - RAILS_MASTER_KEY
     - POSTGRES_PASSWORD
@@ -39,9 +39,8 @@ env:
     - AWS_ACCESS_KEY_ID
     - AWS_SECRET_ACCESS_KEY
 
-  # Use a different ssh user than root
-  # ssh:
-  #   user: app
+ssh:
+  user: ubuntu
 
   # Configure builder setup.
   # builder:
@@ -57,7 +56,7 @@ env:
 accessories:
   db:
     image: postgres:15
-    host: 159.203.142.226
+    host: 34.192.107.71
     port: 5432
     env:
       clear:

config/environments/production.rb

@@ -80,7 +80,7 @@
   ActionMailer::Base.smtp_settings = {
     :user_name => 'apikey',
     :password => Rails.application.credentials.sendgrid_api_key,
-    :domain => 'prettygood.software',
+    :domain => 'em7128.staffplan.com',
     :address => 'smtp.sendgrid.net',
     :port => 587,
     :authentication => :plain,
@@ -105,6 +105,6 @@
   # Skip DNS rebinding protection for the default health check endpoint.
   # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
 
-  Rails.application.routes.default_url_options[:host] = 'staffplan.fermion.dev'
+  Rails.application.routes.default_url_options[:host] = 'staffplan.com'
   Rails.application.routes.default_url_options[:protocol] = 'https'
 end

config/initializers/cors.rb

@@ -1,7 +1,7 @@
 Rails.application.config.middleware.insert_before 0, Rack::Cors do
   allow do
     origins "http://localhost:8080"
-      "https://staffplan-ui.fermion.dev"
+      "https://ui.staffplan.com"
 
     resource "*",
              headers: :any,