Expand on pricing page Q&A, and include compose for Ruby 2.6

Since Ubuntu 22.04 and MacOS now ship with newer Ruby versions the site no longer works locally. Switching to Docker allows us to continue developing the site without having to migrate to a newer Ruby version. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
inlets · Jun 6, 2024 · aeb2414 · aeb2414
1 parent d9c4e44
commit aeb2414
Show file tree

Hide file tree

Showing 7 changed files with 126 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,21 @@
+FROM ruby:2.6.3
+
+RUN curl -sLS https://get.arkade.dev | sh && \
+    arkade system install node
+
+WORKDIR /srv/jekyll
+
+RUN gem install bundler:2.2.13
+
+RUN npm i -g yarn
+
+COPY Gemfile Gemfile
+COPY Gemfile.lock Gemfile.lock
+
+RUN bundle install -j $(nproc)
+
+# Run this on the host and have it mounted in.
+# RUN yarn install
+
+RUN find /root/.gem
+CMD ["/usr/local/bin/bundle", "exec", "jekyll", "serve", "--host=0.0.0.0", "--trace"]
diff --git a/README.md b/README.md
@@ -22,7 +22,26 @@ If you use any copyrighted material such as text, code, or images, then you must
 
 ## Usage
 
-## Initial installation
+### Running with docker, when Ruby 2.x is not installed
+
+For live-reloading, you may need to alter the inotify settings for Linux:
+
+```bash
+echo 2048 | sudo tee /proc/sys/fs/inotify/max_user_instances
+sudo sysctl -p
+```
+
+Then bring the site up with:
+
+```bash
+docker-compose up --build
+```
+
+Access the site at: http://127.0.0.1:4000/
+
+When you're finished, run: `docker-compose down`.
+
+### Initial installation to run locally, if Ruby 2.x is installed
 
 You will need node.js in order to install yarn:
 

diff --git a/_includes/pricing/pricing-calc.html b/_includes/pricing/pricing-calc.html
@@ -0,0 +1,56 @@
+<div class="py-8 bg-gray-50 overflow-hidden">
+    <div class="max-w-7xl mx-auto px-4 space-y-8 sm:px-6 lg:px-8">
+
+      <div class="text-base max-w-prose mx-auto lg:max-w-none">
+        <p class="mt-2 text-2xl leading-8 font-extrabold tracking-tight text-gray-900 sm:text-2xl">How many licenses do we need?</p>
+      </div>
+
+      <div class="relative z-10 text-base max-w-prose mx-auto lg:max-w-5xl lg:mx-0 lg:pr-72">
+        <p class="text-md text-gray-500 leading-7 text-justify mb-2">
+          A license is needed for each inlets TCP or HTTP client that you intend to run, however a single tunnel can multiplex many different services.
+        </p>
+        <p class="text-md text-gray-500 leading-7 text-justify mb-2">
+          There two ways to multiple different sites or domains:
+          <ul>
+            <li class="mt-4 flex items-start text-md text-gray-500 leading-7 text-justify mb-2">1. With an inlets HTTP tunnel server/client, you can specify different domains for different services.</li>
+            <li class="mt-4 flex items-start text-md text-gray-500 leading-7 text-justify mb-2">2. With an inlets TCP tunnel you can expose ports 80 and 443 from a reverse proxy or Ingress Controller to act like a cloud load-balancer.</li>
+          </ul>
+        </p>
+      </div>
+
+      <div class="bg-white">
+        <div class="max-w-7xl mx-auto py-2 px-4 sm:px-6 lg:py-6 lg:px-8">
+          <div class="lg:grid lg:grid-cols-3 lg:gap-8">
+            <div class="mt-12 lg:mt-0 lg:col-span-2">
+              <dl class="space-y-10">
+                <div>
+                  <dt class="text-lg leading-6 font-medium text-gray-900">How many domains or sites can I expose over a single tunnel?</dt>
+                  <dd class="mt-2 text-base text-gray-500">If you expose a reverse proxy or a Kubernetes Ingress Controller using a TCP tunnel, then you can expose as many sites as you want.</dd>
+                </div>
+                <div>
+                  <dt class="text-lg leading-6 font-medium text-gray-900">When do I need multiple HTTP tunnels clients?</dt>
+                  <dd class="mt-2 text-base text-gray-500">You can expose as many HTTP endpoints as you like so long as they are reachable by the tunnel client. If your sites are spread across isolated networks, then you would need one per network.</dd>
+                </div>
+                <div>
+                  <dt class="text-lg leading-6 font-medium text-gray-900">Can I connect multiple clients to the same HTTP tunnel server?</dt>
+                  <dd class="mt-2 text-base text-gray-500">Yes, this is possible, even if the tunnel clients are in different networks. Make sure you specify the domain name to use for routing. When the same name is given by multiple clients, the server will load balance</dd>
+                </div>
+                <div>
+                  <dt class="text-lg leading-6 font-medium text-gray-900">Do I need to pay to have high-availability of tunnel clients?</dt>
+                  <dd class="mt-2 text-base text-gray-500">You can have up to three identical replicas of the same inlets tunnel client connected to the same tunnel server, at no additional cost.</dd>
+                </div>
+                <div>
+                    <dt class="text-lg leading-6 font-medium text-gray-900">When should we consider uplink over the stand-alone version?</dt>
+                    <dd class="mt-2 text-base text-gray-500">Inlets uplink is for service providers and SaaS companies who need to create tunnels on a dynamic basis.</dd>
+                </div>
+                <div>
+                    <dt class="text-lg leading-6 font-medium text-gray-900">When do I need multiple TCP tunnels clients?</dt>
+                    <dd class="mt-2 text-base text-gray-500">As a default, a TCP tunnel can only expose ports from a single upstream, however the <pre class="text-gray-800" style="display: inline-block;">inlets-pro sshmux</pre> command can be used to multiplex multiple SSH endpoints or TLS endpoints over one TCP tunnel.</dd>
+                </div>
+              </dl>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+</div>
diff --git a/_includes/pricing/pricing-personal.html b/_includes/pricing/pricing-personal.html
@@ -1,4 +1,4 @@
-<div class="py-16 bg-gray-50 overflow-hidden">
+<div class="py-8 bg-gray-50 overflow-hidden">
     <div class="max-w-7xl mx-auto px-4 space-y-8 sm:px-6 lg:px-8">
 
       <div class="text-base max-w-prose mx-auto lg:max-w-none">
@@ -45,19 +45,7 @@
         </div>
       </div>
 
-      <div class="lg:grid lg:grid-cols-2 lg:gap-8 lg:items-start">
-        <div class="relative z-10">
-          <div class="prose prose-indigo text-gray-500 mx-auto lg:max-w-none">
-            <div class="text-base max-w-prose mx-auto lg:max-w-none">
-              <p class="mt-2 text-3xl leading-8 font-extrabold tracking-tight text-gray-900 sm:text-4xl">Ask us a question</p>
-            </div>
-              <p>If you have questions for us, you can get in touch below.</p>
+      {% include pricing/pricing-question.html %}
 
-              <a href="/contact" style="color: white;"  class="w-1/2 flex items-center justify-center px-8 py-3 border border-transparent text-base font-medium rounded-md text-sm font-semibold text-white bg-indigo-600 hover:bg-indigo-700 ">
-                Contact Us
-              </a>
-            </div>
-          </div>
-        </div>
     </div>
 </div>
diff --git a/_includes/pricing/pricing-question.html b/_includes/pricing/pricing-question.html
@@ -0,0 +1,14 @@
+<div class="lg:grid lg:grid-cols-2 lg:gap-8 lg:items-start">
+    <div class="relative z-10">
+      <div class="prose prose-indigo text-gray-500 mx-auto lg:max-w-none">
+        <div class="text-base max-w-prose mx-auto lg:max-w-none">
+          <p class="mt-2 text-3xl leading-8 font-extrabold tracking-tight text-gray-900 sm:text-4xl">Ask us a question</p>
+        </div>
+          <p>If you have questions for us, you can get in touch below.</p>
+
+          <a href="/contact" style="color: white;"  class="w-1/2 flex items-center justify-center px-8 py-3 border border-transparent text-base font-medium rounded-md text-sm font-semibold text-white bg-indigo-600 hover:bg-indigo-700 ">
+            Contact Us
+          </a>
+        </div>
+    </div>
+</div>
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -0,0 +1,11 @@
+version: "3"
+services:
+  inlets-dev-jekyll:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: alexellis2/inlets-dev:latest
+    volumes:
+      - .:/srv/jekyll
+    ports:
+      - 4000:4000
diff --git a/pricing/index.html b/pricing/index.html
@@ -10,6 +10,8 @@
 {% include pricing/pricing-grid.html %}
 <div style="padding-bottom: 20px;"></div>
 
+{% include pricing/pricing-calc.html %}
+
 {% include pricing/pricing-personal.html %}
 <!-- <div style="padding-bottom: 20px;"></div> -->