Merge pull request 'Cache dependencies on CI' (#6) from chore/cache_bundle_on_ci into master

Reviewed-on: #6

.drone.yml

@@ -3,12 +3,35 @@ type: docker
 name: CI build
 
 steps:
+  - name: restore-cache
+    image: drillster/drone-volume-cache
+    volumes:
+    - name: cache
+      path: /cache
+    settings:
+      restore: true
+      mount:
+      - vendor
   - name: rspec
     image: guildeducation/rails:2.7.1-12.19.0
     commands:
-      - bundle install
+      - bundle install --jobs=3 --retry=3 --deployment
       - yarn install
       - bundle exec rspec
     when:
       branch:
         - master
+  - name: rebuild-cache
+    image: drillster/drone-volume-cache
+    volumes:
+    - name: cache
+      path: /cache
+    settings:
+      rebuild: true
+      mount:
+      - vendor
+
+volumes:
+  - name: cache
+    host:
+      path: /var/lib/drone/tmp

Gemfile

@@ -3,8 +3,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server
 gem 'puma', '~> 4.1'
 # Use SCSS for stylesheets
@@ -31,6 +29,8 @@ gem 'devise_ldap_authenticatable'
 gem 'net-ldap'
 
 group :development, :test do
+  # Use sqlite3 as the database for Active Record
+  gem 'sqlite3', '~> 1.4'
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
 end
@@ -53,5 +53,9 @@ group :test do
   gem 'database_cleaner'
 end
 
+group :production do
+  # Use postgresql as the database for Active Record
+  gem 'pg', '~> 1.2.3'
+end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

Gemfile.lock

@@ -131,6 +131,7 @@ GEM
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
+    pg (1.2.3)
     public_suffix (4.0.6)
     puma (4.3.6)
       nio4r (~> 2.0)
@@ -255,6 +256,7 @@ DEPENDENCIES
   letter_opener_web
   listen (~> 3.2)
   net-ldap
+  pg (~> 1.2.3)
   puma (~> 4.1)
   rails (~> 6.0.3, >= 6.0.3.4)
   rspec-rails

app/controllers/admin/ldap_users_controller.rb

@@ -25,7 +25,7 @@ class Admin::LdapUsersController < Admin::BaseController
   private
 
   def ldap_client
-    ldap_client ||= Net::LDAP.new host: ENV['LDAP_HOST'],
+    ldap_client ||= Net::LDAP.new host: ldap_config['host'],
       port: ldap_config['port'],
       encryption: ldap_config['ssl'],
       auth: {

app/views/dashboard/index.html.erb

@@ -17,6 +17,12 @@
         Code hosting and collaboration for software projects
       </p>
     </div>
+    <div class="grid-item gitea">
+      <h3><%= link_to "Drone CI", "https://drone.kosmos.org" %></h3>
+      <p>
+        Continuous integration for software projects, tied to our Gitea
+      </p>
+    </div>
     <div class="grid-item wiki">
       <h3><%= link_to "Wiki", "https://wiki.kosmos.org" %></h3>
       <p>

config/credentials.yml.enc

@@ -1 +1 @@
-2Xf7uhBU+61XZL2HMF8Xs9fhVkpOhNfV5PKkHPu4uASpP1zwEJZcRyTJrhBVvJ29Y3m+3hhNAI2OeiYFDPepMDWcocrVjS+am/Gt9DW2tbhYZo0nN9lMU6EymQ5tl9ROgnvcPukwf823/Mrb6zPBysHruOlhdRc7JmW6EXuxL6tUhGsSJmaRfGiMWwiioJsyHCB2VsesKZlSDxItnhuX5d8gBABJyNdzi+Pyepz7MWkWp6ux80jOANq5uljn8bP5CLgUZKoGgveKzZdIs2uNb0wSIohSn+Ckfm+QhMm6mlEocAkHPt+nToiNAmSnx7p/l1sqKNFXslXHJKdkFFr8tx/R45aGPA/nL6R16DOnjtsJ84JXeh13VwR/0ZkyzsM2dQIwCvwo3xjdgBi46HWMwXwm6Y3A+ni6sK5BEvmAT4qu--AoOw35tpM//TeoWI--Uz4fvyRgmc2ewK6d7OFo6A==
+LWyKwPZq9Kd97rn/7+q3MEkh7kITScDMHD3JvVuaV3A4YIHJHU+460k+PaEGlsH1xkbuClGiAb57rk1XLyDnmVGtbSueYOtinkw6kar8ZfKWZob061LwGjpMVRQkS49TjCUZlqCFrXeKxlH03mXWBnqAj9RUIPrm7eibb3c7qmJFglR1380RSVsfZnp8A3QwGm4Wh9OWtpUa6P2lne0jQsOuSe8ur3DUF0LplzS4CbkMxAUDOom+pXB13AlxOH9NQE7F4dsYHugHkh1tG3r3ER3xAUD/9Kn6UZZP7BnwUs3zqhoZdULRpRgA5dK7ueTIAnO/jtJDF4562VS8ECo7AnNoVxNe8/mBMFIOUfqg+db/72N2pIk3r4lK7Uzm/4jJ5/99ItnQjHQPcApiwZXIr3OyDLUvq5+d0UVmAMXdwcAjvctVQXFx5imG149Y0ISHKWVm1ca37aAspxWPU+CIj8/HW0yEpjp3vhwDUbjCaZeAPm8UQC14MxZwSK3N+EUSQXdltiweFynabDB7zGGQsjMM8LwMtyo9bTBzJA78Cl96MDyd20i1zSF9ntLuKulwGm3oZowpbNuvo2anY6r9yBlDJBOEISbtXv2tLX4SqcM=--bRcsE4K/29XzyZat--+G3iQCLBqgSwLaQ+7+4YvA==

config/database.yml

@@ -22,4 +22,9 @@ test:
 
 production:
   <<: *default
-  database: db/production.sqlite3
+  adapter: postgresql
+  database: akkounts
+  port: 5432
+  host: <%= Rails.application.credentials.postgres[:host] rescue nil %>
+  username: <%= Rails.application.credentials.postgres[:username] rescue nil %>
+  password: <%= Rails.application.credentials.postgres[:password] rescue nil %>

config/environments/production.rb

@@ -59,6 +59,23 @@ Rails.application.configure do
 
   config.action_mailer.perform_caching = false
 
+  config.action_mailer.delivery_method = :smtp
+
+  config.action_mailer.smtp_settings = {
+    address: "mail.gandi.net",
+    port: "587",
+    authentication: "plain",
+    enable_starttls_auto: true,
+    user_name: Rails.application.credentials.smtp[:username],
+    password: Rails.application.credentials.smtp[:password]
+  }
+
+  config.action_mailer.default_url_options = {
+    host: "accounts.kosmos.org",
+    protocol: "https",
+    from: "accounts@kosmos.org"
+  }
+
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false

config/initializers/devise.rb

@@ -49,7 +49,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+  config.mailer_sender = 'accounts@kosmos.org'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'

config/ldap.yml

@@ -50,7 +50,7 @@ production:
   port: 636
   attribute: cn
   base: ou=kosmos.org,cn=users,dc=kosmos,dc=org
-  admin_user: "cn=Directory Manager"
+  admin_user: <%= Rails.application.credentials.ldap[:username] rescue nil %>
-  admin_password: writtenbychef
+  admin_password: <%= Rails.application.credentials.ldap[:password] rescue nil %>
   ssl: simple_tls
   # <<: *AUTHORIZATIONS