Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface
This commit is contained in:
commit
8a31655fd3
1
.ruby-gemset
Normal file
1
.ruby-gemset
Normal file
|
@ -0,0 +1 @@
|
||||||
|
members-hsl
|
1
.ruby-version
Normal file
1
.ruby-version
Normal file
|
@ -0,0 +1 @@
|
||||||
|
ruby-1.9.3-p385
|
35
.rvmrc
35
.rvmrc
|
@ -1,35 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# This is an RVM Project .rvmrc file, used to automatically load the ruby
|
|
||||||
# development environment upon cd'ing into the directory
|
|
||||||
|
|
||||||
# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
|
|
||||||
# Only full ruby name is supported here, for short names use:
|
|
||||||
# echo "rvm use 1.8.7" > .rvmrc
|
|
||||||
environment_id="ruby-1.9.3-p385@members-hsl"
|
|
||||||
|
|
||||||
# Uncomment the following lines if you want to verify rvm version per project
|
|
||||||
# rvmrc_rvm_version="1.18.8 (stable)" # 1.10.1 seams as a safe start
|
|
||||||
# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
|
|
||||||
# echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
|
|
||||||
# return 1
|
|
||||||
# }
|
|
||||||
|
|
||||||
# First we attempt to load the desired environment directly from the environment
|
|
||||||
# file. This is very fast and efficient compared to running through the entire
|
|
||||||
# CLI and selector. If you want feedback on which environment was used then
|
|
||||||
# insert the word 'use' after --create as this triggers verbose mode.
|
|
||||||
if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
|
|
||||||
&& -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
|
|
||||||
then
|
|
||||||
\. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
|
|
||||||
[[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
|
|
||||||
\. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
|
|
||||||
else
|
|
||||||
# If the environment file has not yet been created, use the RVM CLI to select.
|
|
||||||
rvm --create "$environment_id" || {
|
|
||||||
echo "Failed to create RVM environment '${environment_id}'."
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
|
@ -10,6 +10,7 @@ Distributed under a Creative Commons Attribution 3.0 license http://creativecomm
|
||||||
|
|
||||||
To use:
|
To use:
|
||||||
* Install Imagemagick (for Paperclip / image uploads)
|
* Install Imagemagick (for Paperclip / image uploads)
|
||||||
|
* Install arp-scan (for LAN Mac address scanning)
|
||||||
* Load into a Rails 3 environment
|
* Load into a Rails 3 environment
|
||||||
* Copy config/config.yml.example to config/config.yml and edit appropriately
|
* Copy config/config.yml.example to config/config.yml and edit appropriately
|
||||||
* Copy config/database.yml.example to config/database.yml and edit appropriately
|
* Copy config/database.yml.example to config/database.yml and edit appropriately
|
||||||
|
|
Loading…
Reference in New Issue
Block a user