Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions data/clusterPacks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
single node.
- Operates the [Slurm Workload Manager](https://slurm.schedmd.com/) job
scheduler.
- 2 [Alces Flight Center](https://center.alces-flight.com) support credits
- 2 [ConcertIM](https://portal.concertim.com) support credits
per month.
details: |
A cluster comprising an entry-level login node and general-level compute
Expand Down Expand Up @@ -51,7 +51,7 @@
- Autoscales from a single compute node to four balanced compute nodes
(240GiB, 144 CPUs).
- Operates the Open Grid Scheduler (SGE) job Scheduler.
- 5 [Alces Flight Center](https://center.alces-flight.com) support credits
- 5 [ConcertIM](https://portal.concertim.com) support credits
per month.
details: |
A cluster comprising a medium-sized login node and balanced compute nodes
Expand All @@ -78,7 +78,7 @@
- Autoscales from a single GPU node to two GPU nodes (976 GiB, 64 CPUs, 16
GPUs).
- Operates the Open Grid Scheduler (SGE) job Scheduler.
- 10 [Alces Flight Center](https://center.alces-flight.com) support
- 10 [ConcertIM](https://portal.concertim.com) support
credits per month.
details: |
A cluster comprising a medium-sized login node and GPU compute nodes (488
Expand Down
18 changes: 9 additions & 9 deletions data/creditPacks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

# Used as the product name on the checkout form and email. It should
# probably match the entry in `stripe.description`.
name: Pack of 5 Alces Flight Center service credits
name: Pack of 5 ConcertIM service credits

# The type of product. This must match the filename.
type: creditPacks
Expand All @@ -40,15 +40,15 @@
# features:
# - tick: true
# text: |
# Allocate to your Flight Center site managed through
# [Alces Flight Center](https://center.alces-flight.com)
# Allocate to your ConcertIM site managed through
# [ConcertIM](https://portal.concertim.com)
# - tick: false
# text: |
# ~Includes rainbows and kittens~

# Optional markdown for the product card.
# details: |
# The Bronze Alces Flight Center credit pack allows you to...
# The Bronze ConcertIM credit pack allows you to...

# Optional. If learnMore is given, the product card will display a "Learn
# more" link. Clicking it will display a modal containing this markdown.
Expand All @@ -68,7 +68,7 @@

# Used as the description by Stripe. It should probably match the entry
# in `name`.
description: Pack of 5 Alces Flight Center service credits
description: Pack of 5 ConcertIM service credits

# The type of Stripe payment to make. Either `charge` or `subscription`.
type: charge
Expand All @@ -93,7 +93,7 @@
emphasise: true
# backgroundColor: var(--teal)
backgroundColor: '#20c997'
name: Pack of 10 Alces Flight Center service credits
name: Pack of 10 ConcertIM service credits
type: creditPacks
identifier: 10-service-credit-pack
cost:
Expand All @@ -104,7 +104,7 @@
stripe:
amount: 235000
currency: gbp
description: Pack of 10 Alces Flight Center service credits
description: Pack of 10 ConcertIM service credits
type: charge
action:
identifier: deposit_credits
Expand All @@ -120,7 +120,7 @@
emphasise: false
# backgroundColor: var(--info)
backgroundColor: '#3498DB'
name: Pack of 15 Alces Flight Center service credits
name: Pack of 15 ConcertIM service credits
type: creditPacks
identifier: 15-service-credit-pack
cost:
Expand All @@ -131,7 +131,7 @@
stripe:
amount: 350000
currency: gbp
description: Pack of 15 Alces Flight Center service credits
description: Pack of 15 ConcertIM service credits
type: charge
action:
identifier: deposit_credits
Expand Down
16 changes: 8 additions & 8 deletions data/productTypeDefinitions.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
- type: clusterPacks
name: Cluster packs
title: HPC cluster pack
subtitle: Fully managed Alces Flight HPC cluster with Flight Center support
subtitle: Fully managed ConcertIM HPC cluster with ConcertIM support
description: |
An Alces Flight HPC cluster built by our experienced engineering team in
A ConcertIM HPC cluster built by our experienced engineering team in
a Virtual Private Cluster (VPC) environment for security, with SSH and
graphical-desktop connectivity for users. Data management tools for POSIX
and S3 object storage are also included to help users transfer files and
manage storage resources.

The cluster will be fully managed by Alces using the [Alces Flight
Center](https://center.alces-flight.com) service. Where you will be able
The cluster will be fully managed by Alces using the
[ConcertIM](https://portal.concertim.com) service. Where you will be able
to view the dozens of daily checks our engineering team will perform to
ensure the health of your cluster request support and advice and access
the comprehensive support logs for your cluster.
Expand All @@ -19,15 +19,15 @@
title: Choose a cluster pack.
overview: |
Ready to get going? Choose a cluster pack, enter your credit card
details and request your fully managed Alces Flight HPC cluster.
details and request your fully managed ConcertIM HPC cluster.

- type: creditPacks
name: Support credits
title: Flight Center support credits
subtitle: Support credits for use with Alces Flight Center
title: ConcertIM support credits
subtitle: Support credits for use with ConcertIM
description: |
The support credits can be allocated to any of your HPC clusters managed
through [Alces Flight Center](https://center.alces-flight.com). You will
through [ConcertIM](https://portal.concertim.com). You will
be able to view the dozens of daily checks our engineering team will
perform to ensure the health of your cluster request support and advice
and access the comprehensive support logs for your cluster.
Expand Down
2 changes: 1 addition & 1 deletion flight-store-lib/demo/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
Reactware/flight-account-menu are loaded -->
<script>
window.__SSO_BASE_URL__ = 'http://accounts.alces-flight.lvh.me:4000';
window.__SSO_COOKIE_NAME__ = 'flight_sso_dev';
window.__SSO_COOKIE_NAME__ = 'concertim_dev';
window.__FLIGHT_APP_URL__ = 'http://store.alces-flight.lvh.me:3000';

</script>
Expand Down
4 changes: 2 additions & 2 deletions flight-store-lib/src/checkout/components/MustLoginMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ const MustLoginMessage = () => {

return (
<p>
You must be signed in to your Alces Flight account in order to purchase
any products from Alces Flight Store. Please{' '}
You must be signed in to your ConcertIM account in order to purchase
any products from ConcertIM Store. Please{' '}
<a
className="btn btn-link"
href="/sign-in"
Expand Down
2 changes: 1 addition & 1 deletion flight-store-lib/src/reducers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default () => {
return reducerUtils.withStateResetting({
keepStateSlices: [ 'router' ],
// This needs to be consistent with the redux action type used to log a
// user out of Flight SSO. Currently, this has been copied from
// user out of ConcertIM SSO. Currently, this has been copied from
// FlightAccountMenu.
// XXX Take this as a dependency somehow. Preferably without adding a
// dependency on FlightAccountMenu.
Expand Down
14 changes: 7 additions & 7 deletions server/app/controllers/subscriptions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ def find_stripe_product(alces_product)
def find_stripe_plan(product)
plans = Stripe::Plan.list(
active: true,
product: product.id,
product: product.id
)
plans.data.first
end

def subscribe(customer, plan)
Stripe::Subscription.create(
:customer => customer.id,
:items => [
customer: customer.id,
items: [
{
:plan => plan.id,
},
plan: plan.id
}
]
)
end
Expand All @@ -48,7 +48,7 @@ def stripe_customer
email: current_user.email,
source: params[:token],
metadata: {
flight_id: current_user.flight_id,
flight_id: current_user.flight_id
}
).tap do |customer|
current_user.stripe_id = customer.id
Expand All @@ -64,7 +64,7 @@ def stripe_customer
#
# Solution:
#
# Have the UI check if the flight account is associated with a stripe
# Have the UI check if the ConcertIM account is associated with a stripe
# customer and if that customer has any cards. If so, ask user to
# select one of their existing cards. If not, use the current UI.
#
Expand Down
14 changes: 7 additions & 7 deletions server/config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

# Enable/disable caching. By default caching is disabled.
# Run rails dev:cache to toggle caching.
if Rails.root.join('tmp', 'caching-dev.txt').exist?
if Rails.root.join("tmp", "caching-dev.txt").exist?
config.action_controller.perform_caching = true

config.cache_store = :memory_store
config.public_file_server.headers = {
'Cache-Control' => "public, max-age=#{2.days.to_i}"
"Cache-Control" => "public, max-age=#{2.days.to_i}"
}
else
config.action_controller.perform_caching = false
Expand All @@ -42,9 +42,9 @@
config.active_record.verbose_query_logs = true

if ENV["RAILS_LOG_TO_STDOUT"].present?
logger = ActiveSupport::Logger.new(STDOUT)
logger = ActiveSupport::Logger.new(STDOUT)
# logger.formatter = config.log_formatter
config.logger = ActiveSupport::TaggedLogging.new(logger)
config.logger = ActiveSupport::TaggedLogging.new(logger)
end

# Raises error for missing translations
Expand All @@ -54,10 +54,10 @@
# routes, locales, etc. This feature depends on the listen gem.
config.file_watcher = ActiveSupport::EventedFileUpdateChecker

config.sso_cookie_name = ENV.fetch('SSO_COOKIE_NAME', 'flight_sso_dev')
config.sso_cookie_name = ENV.fetch("SSO_COOKIE_NAME", "concertim_sso_dev")

config.store = {
products_url_prefix: ENV.fetch('PRODUCTS_URL_PREFIX', 'https://alces-flight.s3.amazonaws.com/FlightStore/development-products/'),
vat_rate: ENV.fetch('VAT_RATE', 20),
products_url_prefix: ENV.fetch("PRODUCTS_URL_PREFIX", "https://alces-flight.s3.amazonaws.com/FlightStore/development-products/"),
vat_rate: ENV.fetch("VAT_RATE", 20)
}
end
10 changes: 5 additions & 5 deletions server/config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
# Configure public file server for tests with Cache-Control for performance.
config.public_file_server.enabled = true
config.public_file_server.headers = {
'Cache-Control' => "public, max-age=#{1.hour.to_i}"
"Cache-Control" => "public, max-age=#{1.hour.to_i}"
}

# Show full error reports and disable caching.
config.consider_all_requests_local = true
config.consider_all_requests_local = true
config.action_controller.perform_caching = false

# Raise exceptions instead of rendering exception templates.
Expand All @@ -41,10 +41,10 @@
# Raises error for missing translations
# config.action_view.raise_on_missing_translations = true

config.sso_cookie_name = ENV.fetch('SSO_COOKIE_NAME', 'flight_sso_test')
config.sso_cookie_name = ENV.fetch("SSO_COOKIE_NAME", "concertim_sso_test")

config.store = {
products_url_prefix: ENV.fetch('PRODUCTS_URL_PREFIX', 'https://alces-flight.s3.amazonaws.com/FlightStore/test-products/'),
vat_rate: ENV.fetch('VAT_RATE', 20),
products_url_prefix: ENV.fetch("PRODUCTS_URL_PREFIX", "https://alces-flight.s3.amazonaws.com/FlightStore/test-products/"),
vat_rate: ENV.fetch("VAT_RATE", 20)
}
end
24 changes: 12 additions & 12 deletions server/config/initializers/cors.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@

# Read more: https://github.com/cyu/rack-cors

Rails.application.config.middleware.insert_before 0, Rack::Cors do
allow do
origins 'https://alces-flight.com',
/^.*\.alces-flight.com$/,
/^.*\.alces-flight.lvh.me(:[0-9]+)?$/,
/^http:\/\/localhost(:[0-9]+)?$/
Rails.application.config.middleware.insert_before 0, Rack::Cors do
allow do
origins "https://alces-flight.com",
/^.*\.concertim.com$/,
/^.*\.concertim.lvh.me(:[0-9]+)?$/,
/^http:\/\/localhost(:[0-9]+)?$/

resource '*',
headers: :any,
methods: [:get, :post, :put, :patch, :delete, :options, :head],
credentials: true
end
end
resource "*",
headers: :any,
methods: [:get, :post, :put, :patch, :delete, :options, :head],
credentials: true
end
end