Remove unused custom domain code
parent
051294445a
commit
711cbdfca2
@ -1,25 +0,0 @@
|
||||
<%= form_for @conn, "/", [class: "max-w-md w-full mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 pt-6 pb-8 mb-4 mt-8"], fn f -> %>
|
||||
<h2 class="text-xl font-black dark:text-gray-100">Update javascript snippet</h2>
|
||||
<div class="my-4">
|
||||
<p class="dark:text-gray-100">
|
||||
Allow up to 4 hours for DNS changes to propagate and for us to obtain an SSL certificate for <code><%= @site.custom_domain.domain %></code>
|
||||
</p>
|
||||
<p class="mt-4 dark:text-gray-100">
|
||||
The setup is working when <a href="//<%= @site.custom_domain.domain %>/js/index.js" target="_blank" class="text-indigo-500"><%= @site.custom_domain.domain %>/js/index.js</a> loads the javascript tracker.
|
||||
</p>
|
||||
<p class="mt-4 dark:text-gray-100">
|
||||
To finish your setup, please replace the tracking snippet on your site with the following.
|
||||
</p>
|
||||
|
||||
<div class="relative">
|
||||
<%= textarea f, :domain, id: "snippet_code", class: "transition overflow-hidden bg-gray-100 dark:bg-gray-900 outline-none appearance-none border border-transparent rounded w-full p-2 pr-6 text-gray-700 dark:text-gray-300 leading-normal appearance-none focus:outline-none focus:bg-white dark:focus:bg-gray-900 focus:border-gray-300 dark:focus:border-gray-500 text-xs mt-4 resize-none", value: snippet(@site), rows: 3, readonly: "readonly" %>
|
||||
<a onclick="var textarea = document.getElementById('snippet_code'); textarea.focus(); textarea.select(); document.execCommand('copy');" href="javascript:void(0)" class="no-underline text-indigo-500 text-sm hover:underline">
|
||||
<svg class="absolute text-indigo-500" style="top: 24px; right: 12px;" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<%= link("Back to settings →", class: "button mt-4 w-full", to: "/#{URI.encode_www_form(@site.domain)}/settings/custom-domain") %>
|
||||
<p class="mt-4 text-gray-600 text-sm dark:text-gray-400">
|
||||
Problems? <%= link("Get help via email", to: "mailto:support@plausible.io", class: "text-indigo-500 underline") %>
|
||||
</p>
|
||||
<% end %>
|
||||
@ -1,15 +0,0 @@
|
||||
<%= form_for @changeset, "/sites/#{URI.encode_www_form(@site.domain)}/custom-domains", [class: "max-w-md w-full mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 pt-6 pb-8 mb-4 mt-8"], fn f -> %>
|
||||
<h2 class="text-xl font-black dark:text-gray-100">Setup custom domain</h2>
|
||||
<div class="my-4 dark:text-gray-100">
|
||||
We recommend using a subdomain of the website you're running Plausible on.
|
||||
If your site is on <code>example.com</code> you can use <code>stats.example.com</code>.
|
||||
<br /><br /> The name of the subdomain can be anything, it doesn't have to be <code>stats</code>.
|
||||
</div>
|
||||
<div class="my-4">
|
||||
<%= label f, :domain, class: "block text-sm font-bold dark:text-gray-100" %>
|
||||
<%= text_input f, :domain, class: "transition mt-3 bg-gray-100 dark:bg-gray-900 outline-none appearance-none border border-transparent rounded w-full p-2 text-gray-700 dark:text-gray-300 leading-normal focus:outline-none focus:bg-white dark:focus:bg-gray-800 focus:border-gray-300 dark:focus:border-gray-500", placeholder: "stats.[yourdomain].com" %>
|
||||
<%= error_tag f, :domain %>
|
||||
</div>
|
||||
|
||||
<%= submit "DNS setup →", class: "button mt-4 w-full dark:text-gray-100" %>
|
||||
<% end %>
|
||||
@ -1,64 +0,0 @@
|
||||
defmodule Plausible.Workers.ProvisionSslCertificates do
|
||||
use Plausible.Repo
|
||||
use Oban.Worker, queue: :provision_ssl_certificates, max_attempts: 1
|
||||
require Logger
|
||||
@timeout 20_000
|
||||
|
||||
@impl Oban.Worker
|
||||
def perform(_job, ssh \\ SSHEx) do
|
||||
config = get_config()
|
||||
|
||||
{:ok, conn} =
|
||||
ssh.connect(
|
||||
ip: to_charlist(config[:ip]),
|
||||
user: to_charlist(config[:user]),
|
||||
password: to_charlist(config[:password])
|
||||
)
|
||||
|
||||
recent_custom_domains =
|
||||
Repo.all(
|
||||
from cd in Plausible.Site.CustomDomain,
|
||||
where: cd.updated_at > fragment("now() - '3 days'::interval"),
|
||||
where: not cd.has_ssl_certificate
|
||||
)
|
||||
|
||||
for domain <- recent_custom_domains do
|
||||
res =
|
||||
ssh.run(
|
||||
conn,
|
||||
'sudo certbot certonly --webroot -w /root/webroot -n -d \"#{domain.domain}\"',
|
||||
channel_timeout: @timeout,
|
||||
exec_timeout: @timeout
|
||||
)
|
||||
|
||||
case res do
|
||||
{:ok, msg, code} ->
|
||||
report_result({msg, code}, domain)
|
||||
|
||||
e ->
|
||||
Logger.warn("Error obtaining SSL certificate for #{domain.domain}: #{inspect(e)}")
|
||||
end
|
||||
end
|
||||
|
||||
:ok
|
||||
end
|
||||
|
||||
defp report_result({_, 0}, domain) do
|
||||
Ecto.Changeset.change(domain, has_ssl_certificate: true) |> Repo.update!()
|
||||
Plausible.Slack.notify("Obtained SSL cert for #{domain.domain}")
|
||||
:ok
|
||||
end
|
||||
|
||||
defp report_result({error_msg, error_code}, domain) do
|
||||
Logger.warn(
|
||||
"Error obtaining SSL certificate for #{domain.domain}: #{error_msg} (code=#{error_code})"
|
||||
)
|
||||
|
||||
# Failing to obtain is expected, not a failure for the job queue
|
||||
:ok
|
||||
end
|
||||
|
||||
defp get_config() do
|
||||
Application.get_env(:plausible, :custom_domain_server)
|
||||
end
|
||||
end
|
||||
@ -1,63 +0,0 @@
|
||||
defmodule Plausible.Workers.SslCertificatesTest do
|
||||
use Plausible.DataCase
|
||||
alias Plausible.Workers.ProvisionSslCertificates
|
||||
import Double
|
||||
|
||||
test "makes ssh call to certbot" do
|
||||
site = insert(:site)
|
||||
insert(:custom_domain, site: site, domain: "custom-site.com")
|
||||
|
||||
ssh_stub =
|
||||
stub(SSHEx, :connect, fn _cmd -> {:ok, nil} end)
|
||||
|> stub(:run, fn _conn, _cmd, _opts -> {:ok, "", 0} end)
|
||||
|
||||
ProvisionSslCertificates.perform(nil, ssh_stub)
|
||||
|
||||
assert_receive(
|
||||
{SSHEx, :run,
|
||||
[nil, 'sudo certbot certonly --webroot -w /root/webroot -n -d "custom-site.com"', _]}
|
||||
)
|
||||
end
|
||||
|
||||
test "sets has_ssl_certficate=true if the ssh command is succesful" do
|
||||
site = insert(:site)
|
||||
insert(:custom_domain, site: site, domain: "custom-site.com")
|
||||
|
||||
ssh_stub =
|
||||
stub(SSHEx, :connect, fn _cmd -> {:ok, nil} end)
|
||||
|> stub(:run, fn _conn, _cmd, _opts -> {:ok, "", 0} end)
|
||||
|
||||
ProvisionSslCertificates.perform(nil, ssh_stub)
|
||||
|
||||
domain = Repo.get_by(Plausible.Site.CustomDomain, site_id: site.id)
|
||||
assert domain.has_ssl_certificate
|
||||
end
|
||||
|
||||
test "does not set has_ssl_certficate=true if the ssh command fails" do
|
||||
site = insert(:site)
|
||||
insert(:custom_domain, site: site, domain: "custom-site.com")
|
||||
|
||||
ssh_stub =
|
||||
stub(SSHEx, :connect, fn _cmd -> {:ok, nil} end)
|
||||
|> stub(:run, fn _conn, _cmd, _opts -> {:ok, "", 1} end)
|
||||
|
||||
ProvisionSslCertificates.perform(nil, ssh_stub)
|
||||
|
||||
domain = Repo.get_by(Plausible.Site.CustomDomain, site_id: site.id)
|
||||
refute domain.has_ssl_certificate
|
||||
end
|
||||
|
||||
test "does not set has_ssl_certficate=true if the ssh command errors completely" do
|
||||
site = insert(:site)
|
||||
insert(:custom_domain, site: site, domain: "custom-site.com")
|
||||
|
||||
ssh_stub =
|
||||
stub(SSHEx, :connect, fn _cmd -> {:ok, nil} end)
|
||||
|> stub(:run, fn _conn, _cmd, _opts -> {:error, "msg"} end)
|
||||
|
||||
ProvisionSslCertificates.perform(nil, ssh_stub)
|
||||
|
||||
domain = Repo.get_by(Plausible.Site.CustomDomain, site_id: site.id)
|
||||
refute domain.has_ssl_certificate
|
||||
end
|
||||
end
|
||||
Loading…
Reference in New Issue