From c3e95cfcba86f03d1eb43905787b0a280b0faf0c Mon Sep 17 00:00:00 2001
From: Martin Lensment <mlensment@gmail.com>
Date: Tue, 19 May 2015 10:03:28 +0300
Subject: [PATCH] Add logging to CRL update

---
 app/models/certificate.rb | 18 ++++++++++++++----
 doc/certificates.md       |  4 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/models/certificate.rb b/app/models/certificate.rb
index 4d1095de4..590a79092 100644
--- a/app/models/certificate.rb
+++ b/app/models/certificate.rb
@@ -103,14 +103,16 @@ class Certificate < ActiveRecord::Base
     end
 
     def update_id_crl
+      STDOUT << "#{Time.zone.now.utc} - Updating ID CRL"
+
       %x(
         mkdir -p #{ENV['crl_dir']}/crl-id-temp
         cd #{ENV['crl_dir']}/crl-id-temp
 
-        wget https://sk.ee/crls/esteid/esteid2007.crl
-        wget https://sk.ee/crls/juur/crl.crl
-        wget https://sk.ee/crls/eeccrca/eeccrca.crl
-        wget https://sk.ee/repository/crls/esteid2011.crl
+        wget https://sk.ee/crls/esteid/esteid2007.crl &> /dev/null
+        wget https://sk.ee/crls/juur/crl.crl &> /dev/null
+        wget https://sk.ee/crls/eeccrca/eeccrca.crl &> /dev/null
+        wget https://sk.ee/repository/crls/esteid2011.crl &> /dev/null
 
 
         # convert to PEM
@@ -130,9 +132,13 @@ class Certificate < ActiveRecord::Base
 
         rm -rf #{ENV['crl_dir']}/crl-id-temp
       )
+
+      STDOUT << "#{Time.zone.now.utc} - ID CRL updated"
     end
 
     def update_registry_crl
+      STDOUT << "#{Time.zone.now.utc} - Updating registry CRL"
+
       %x(
         mkdir -p #{ENV['crl_dir']}/crl-temp
         cd #{ENV['crl_dir']}/crl-temp
@@ -149,10 +155,14 @@ class Certificate < ActiveRecord::Base
 
         rm -rf #{ENV['crl_dir']}/crl-temp
       )
+
+      STDOUT << "#{Time.zone.now.utc} - Registry CRL updated"
     end
 
     def reload_apache
+      STDOUT << "#{Time.zone.now.utc} - Reloading apache"
       `sudo /etc/init.d/apache2 reload`
+      STDOUT << "#{Time.zone.now.utc} - Apache reloaded"
     end
   end
 end
diff --git a/doc/certificates.md b/doc/certificates.md
index d611add2e..2e400ac66 100644
--- a/doc/certificates.md
+++ b/doc/certificates.md
@@ -215,9 +215,9 @@ After deploy, in rails console:
 
     Certificate.update_crl
 
-Update whenever:
+Update cron:
 
-    mina whenever:update
+    mina cron:setup
 
 Configure Apache (set location according to registrant and registrar):