Commit d5cd0bb2 authored by Cool Fire's avatar Cool Fire

Merge branch 'development' into 'master'

Preview release 2

See merge request !1
parents a1e588be f2674a9c
Pipeline #346 passed with stages
in 46 minutes and 20 seconds
......@@ -26,12 +26,13 @@ lint_yaml:
script:
- gem install yamllint --no-ri --no-rdoc
- yamllint content/*.yaml
tests:
rack_test:
stage: testing
image: ruby:2.4
script:
- gem install rack-test --no-ri --no-rdoc
- bundle install
- touch .current
- ruby test.rb
deploy:
stage: deploy
......
......@@ -3,7 +3,7 @@ header: Insomnia 24/7 shells signup
blurb: |
<h3>Specifying your reasons</h3>
<p>If you have an invite code you need not enter any additional reasons, though you are free to add them if you so desire. For those of you who do not have an invite code, please be as detailed as possible. Describe what projects you have planned or are working on now, what role our shell server would play in the development process, and why you cannot use another free service such as a free web host or GitHub for example. Add anything else you feel is relevant or may help us decide to give you a shell account.</p>
<p>Though we do not have a set list of reasons for which we do create accounts, there are a few we will definitely not give out accounts for. We are very sorry if this includes your desired usage but we need to enforce this to keep our service viable. We hope you understand.</p>
<p>Though we do not have a set list of reasons for which we do create accounts, there are a few we will definitely not give out accounts for. We are very sorry if this includes your desired usage but we need to enforce this to keep our service viable in the long term. We hope you understand.</p>
<p>The list of known "bad" reasons can be found on <a href="https://wiki.insomnia247.nl/wiki/Shells_FAQ#What_are_bad_reasons_for_an_invite.3F">our wiki</a>.
body: >
Please enter your details below.
......@@ -2,5 +2,5 @@
for c in {1..4}
do
ssh signup@insomnia247.nl "cd /home/signup/public_html && git pull" && break || sleep 3 && echo "retry"
ssh signup@insomnia247.nl "cd /home/signup/public_html && git pull && git log -n1 --pretty=%h > .current" && break || sleep 3 && echo "retry"
done
......@@ -5,8 +5,9 @@ require 'yaml'
# Main class for signup site
class SignupSite < Sinatra::Base
enable :sessions
set :title, 'Shell signup - Insomnia 24/7'
use Rack::Session::Pool, :expire_after => 60 * 60 * 4
set :title, 'Shell signup - Insomnia 24/7'
set :gitid, IO.read('.current')
get '/' do
landing = YAML.load_file('content/landing.yaml')
......
......@@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="./css/bootstrap-superhero.min.css">
<style>.progress{margin: 0;}</style>
<title><%= settings.title %></title>
</head>
......@@ -29,6 +30,9 @@
<div class="progress">
<div class="progress-bar progress-bar-info" style="width: <%= @progress %>%"></div>
</div>
<div class="panel-footer text-muted">
Build id: <a class="text-muted" href="https://git.insomnia247.nl/shells/signup-site/tree/<%= settings.gitid %>"><%= settings.gitid %></a>
</div>
</div>
</div>
</body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment