Skip to content

Commit

Permalink
Info about GSISSH CRL and update script
Browse files Browse the repository at this point in the history
Also updating Scalarm Libs to version with updated bundle CRL
  • Loading branch information
kliput committed Mar 1, 2016
1 parent 05b457b commit 280a862
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Scalarm configuration
# Scalarm configuration and var files
config/secrets.yml
config/scalarm.yml
config/puma.rb
config/google_client_secrets.json
config/plgrid_crl.pem

# IDE settings
.idea/
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ gem 'newrelic_rpm'
gem 'scalarm-database', '1.3.0', git: 'git://github.com/Scalarm/scalarm-database.git'

## for local development - set path to scalarm-core
gem 'scalarm-service_core', path: '/vagrant/scalarm-service_core'
#gem 'scalarm-service_core', '~> 1.1.1', git: 'git://github.com/Scalarm/scalarm-service_core.git'
# gem 'scalarm-service_core', '~> 0.8', path: '/Users/jliput/Scalarm/scalarm-service_core'
gem 'scalarm-service_core', '~> 1.2.1', git: 'git://github.com/Scalarm/scalarm-service_core.git'

#oauth2
gem 'signet'
21 changes: 14 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,24 @@ GIT
encryptor (= 1.3.0)
mongo

PATH
remote: /vagrant/scalarm-service_core
GIT
remote: git://github.com/Scalarm/scalarm-service_core.git
revision: 7bf01fe3a69cc914210b1b677207aa7c85d02a70
specs:
scalarm-service_core (1.1.1)
scalarm-service_core (1.2.1)
actionpack (~> 4.1)
activesupport (~> 4.1)
grid-proxy (~> 0.1)
rest-client (~> 1.8)

GIT
remote: git://github.com/rweng/jquery-datatables-rails.git
revision: d0f07e9aded9de30a2ca796d8036b332b41645dc
specs:
jquery-datatables-rails (3.0.0)
jquery-rails
sass-rails

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -438,6 +447,7 @@ DEPENDENCIES
haml
jbuilder (~> 1.2)
jit-rails
jquery-datatables-rails!
jquery-rails
jquery-tmpl-rails
jquery-ui-rails
Expand All @@ -458,13 +468,10 @@ DEPENDENCIES
rubyzip
sass-rails (~> 4.0.0)
scalarm-database (= 1.3.0)!
scalarm-service_core!
scalarm-service_core (~> 1.2.1)!
sdoc
signet
therubyracer
uglifier (>= 1.3.0)
vmstat
xml-simple

BUNDLED WITH
1.11.2
4 changes: 4 additions & 0 deletions bin/update_crl.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

SCRIPT_PATH=$( cd $(dirname $0) ; pwd -P )
curl http://plgrid-sca.wcss.wroc.pl/crl.pem > ${SCRIPT_PATH}/../config/plgrid_crl.pem
7 changes: 6 additions & 1 deletion config/secrets.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ default: &DEFAULT
## GitHub OAuth2 authentication
#github_client_id: "whatever your code is"
#github_client_secret: "whatever your secret is"


## GSISSH certificates - sometimes CRL bundled in Scalarm::ServiceCore can be outdated,
## so fetch new one with bin/update_crl.sh
# proxy_cert_ca: "/etc/grid-security/certificates/afed687d.0"
# proxy_cert_crl: "config/plgrid_crl.pem"

## InformationService - a service locator
information_service_url: "localhost:11300"
information_service_user: "<set to custom name describing your Scalarm instance>"
Expand Down

0 comments on commit 280a862

Please sign in to comment.