-
FireZone
+
Firezone
Introduction
@@ -45,7 +45,7 @@
diff --git a/mix.exs b/mix.exs
index 8a46c9f58..0a77af97d 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,6 +1,6 @@
defmodule FirezoneUmbrella.MixProject do
@moduledoc """
- Welcome to the FireZone Elixir Umbrella Project
+ Welcome to the Firezone Elixir Umbrella Project
"""
use Mix.Project
diff --git a/omnibus/config/projects/firezone.rb b/omnibus/config/projects/firezone.rb
index f4bb04f06..1907bd43d 100644
--- a/omnibus/config/projects/firezone.rb
+++ b/omnibus/config/projects/firezone.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Copyright 2021 FireZone
+# Copyright 2021 Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
#
name "firezone"
-maintainer "FireZone"
+maintainer "Firezone"
homepage "https://firez.one"
license "Apache-2.0"
license_file "../LICENSE"
diff --git a/omnibus/config/software/autoconf.rb b/omnibus/config/software/autoconf.rb
index 324c6fc07..ac5d1b2fa 100644
--- a/omnibus/config/software/autoconf.rb
+++ b/omnibus/config/software/autoconf.rb
@@ -28,7 +28,7 @@ dependency "m4"
version("2.69") { source sha256: "954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969" }
version("2.71") { source sha256: "431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c" }
-source url: "https://mirrors.ocf.berkeley.edu/gnu/autoconf/autoconf-#{version}.tar.gz"
+source url: "https://mirrors.kernel.org/gnu/autoconf/autoconf-#{version}.tar.gz"
relative_path "autoconf-#{version}"
diff --git a/omnibus/config/software/automake.rb b/omnibus/config/software/automake.rb
index 83a809e59..0c2c53758 100644
--- a/omnibus/config/software/automake.rb
+++ b/omnibus/config/software/automake.rb
@@ -30,7 +30,7 @@ version("1.16") { source sha256: "80da43bb5665596ee389e6d8b64b4f122ea4b92a685b1d
version("1.15") { source sha256: "7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924" }
version("1.11.2") { source sha256: "c339e3871d6595620760725da61de02cf1c293af8a05b14592d6587ac39ce546" }
-source url: "https://mirrors.ocf.berkeley.edu/gnu/automake/automake-#{version}.tar.gz"
+source url: "https://mirrors.kernel.org/gnu/automake/automake-#{version}.tar.gz"
relative_path "automake-#{version}"
diff --git a/omnibus/config/software/bison.rb b/omnibus/config/software/bison.rb
index e4d920d5d..1ef7af3a7 100644
--- a/omnibus/config/software/bison.rb
+++ b/omnibus/config/software/bison.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Copyright:: FireZone
+# Copyright:: Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/config/software/elixir.rb b/omnibus/config/software/elixir.rb
index 82ad22812..1e5758299 100644
--- a/omnibus/config/software/elixir.rb
+++ b/omnibus/config/software/elixir.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
# Copyright 2017 Chef Software, Inc.
-# Copyright 2021 FireZone
+# Copyright 2021 Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/config/software/erlang.rb b/omnibus/config/software/erlang.rb
index 858b30dd6..b1030a671 100644
--- a/omnibus/config/software/erlang.rb
+++ b/omnibus/config/software/erlang.rb
@@ -1,6 +1,6 @@
#
# Copyright:: Chef Software, Inc.
-# Copyright:: FireZone
+# Copyright:: Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/config/software/firezone-scripts.rb b/omnibus/config/software/firezone-scripts.rb
index 051f3abd9..e7f8070c9 100644
--- a/omnibus/config/software/firezone-scripts.rb
+++ b/omnibus/config/software/firezone-scripts.rb
@@ -1,6 +1,6 @@
#
# Copyright:: Copyright (c) 2015 GitLab B.V.
-# Copyright:: Copyright (c) 2021 FireZone
+# Copyright:: Copyright (c) 2021 Firezone
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/omnibus/config/software/firezone.rb b/omnibus/config/software/firezone.rb
index 6290a9c5e..6db8d819b 100644
--- a/omnibus/config/software/firezone.rb
+++ b/omnibus/config/software/firezone.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Copyright 2021 FireZone
+# Copyright 2021 Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/config/software/flex.rb b/omnibus/config/software/flex.rb
index 86e947549..d71631aa5 100644
--- a/omnibus/config/software/flex.rb
+++ b/omnibus/config/software/flex.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Copyright:: FireZone
+# Copyright:: Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/config/software/gawk.rb b/omnibus/config/software/gawk.rb
index 3382902ad..90350191c 100644
--- a/omnibus/config/software/gawk.rb
+++ b/omnibus/config/software/gawk.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Copyright:: FireZone
+# Copyright:: Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ default_version "5.1.0"
version("5.1.0") { source sha256: "03a0360edcd84bec156fe211bbc4fc8c78790973ce4e8b990a11d778d40b1a26" }
-source url: "https://mirrors.ocf.berkeley.edu/gnu/gawk/gawk-#{version}.tar.gz"
+source url: "https://mirrors.kernel.org/gnu/gawk/gawk-#{version}.tar.gz"
relative_path "gawk-#{version}"
diff --git a/omnibus/config/software/gettext.rb b/omnibus/config/software/gettext.rb
index 528225e24..dbb31306b 100644
--- a/omnibus/config/software/gettext.rb
+++ b/omnibus/config/software/gettext.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Copyright:: FireZone
+# Copyright:: Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ dependency "liblzma"
dependency "icu"
dependency "pkg-config"
-source url: "https://mirrors.ocf.berkeley.edu/gnu/gettext/gettext-#{version}.tar.gz"
+source url: "https://mirrors.kernel.org/gnu/gettext/gettext-#{version}.tar.gz"
version("0.21") do
source sha256: "c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12"
end
diff --git a/omnibus/config/software/gmp.rb b/omnibus/config/software/gmp.rb
index 1f617a97a..df3cbe90d 100644
--- a/omnibus/config/software/gmp.rb
+++ b/omnibus/config/software/gmp.rb
@@ -23,7 +23,7 @@ version("6.2.1") { source sha256: "eae9326beb4158c386e39a356818031bd28f3124cf91
version("6.1.0") { source sha256: "498449a994efeba527885c10405993427995d3f86b8768d8cdf8d9dd7c6b73e8" }
version("6.0.0a") { source sha256: "7f8e9a804b9c6d07164cf754207be838ece1219425d64e28cfa3e70d5c759aaf" }
-source url: "https://mirrors.ocf.berkeley.edu/gnu/gmp/gmp-#{version}.tar.bz2"
+source url: "https://mirrors.kernel.org/gnu/gmp/gmp-#{version}.tar.bz2"
if version == "6.0.0a"
# version 6.0.0a expands to 6.0.0
diff --git a/omnibus/config/software/libiconv.rb b/omnibus/config/software/libiconv.rb
index 915a2e714..b245a8b9f 100644
--- a/omnibus/config/software/libiconv.rb
+++ b/omnibus/config/software/libiconv.rb
@@ -30,7 +30,7 @@ dependency "config_guess"
version("1.15") { source sha256: "ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178" }
version("1.16") { source sha256: "e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04" }
-source url: "https://mirrors.ocf.berkeley.edu/gnu/libiconv/libiconv-#{version}.tar.gz"
+source url: "https://mirrors.kernel.org/gnu/libiconv/libiconv-#{version}.tar.gz"
relative_path "libiconv-#{version}"
diff --git a/omnibus/config/software/libmnl.rb b/omnibus/config/software/libmnl.rb
index 81ea48cc5..46e552910 100644
--- a/omnibus/config/software/libmnl.rb
+++ b/omnibus/config/software/libmnl.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Copyright FireZone
+# Copyright Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/config/software/libnftnl.rb b/omnibus/config/software/libnftnl.rb
index 13a3843be..c298c82ba 100644
--- a/omnibus/config/software/libnftnl.rb
+++ b/omnibus/config/software/libnftnl.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Copyright FireZone
+# Copyright Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/config/software/libtool.rb b/omnibus/config/software/libtool.rb
index 175979b3e..5fbc77a54 100644
--- a/omnibus/config/software/libtool.rb
+++ b/omnibus/config/software/libtool.rb
@@ -30,7 +30,7 @@ version("2.4.6") { source sha256: "e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a
version("2.4.2") { source sha256: "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918" }
version("2.4") { source sha256: "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e" }
-source url: "https://mirrors.ocf.berkeley.edu/gnu/libtool/libtool-#{version}.tar.gz"
+source url: "https://mirrors.kernel.org/gnu/libtool/libtool-#{version}.tar.gz"
relative_path "libtool-#{version}"
diff --git a/omnibus/config/software/linenoise.rb b/omnibus/config/software/linenoise.rb
index 682fa2d77..27bd61744 100644
--- a/omnibus/config/software/linenoise.rb
+++ b/omnibus/config/software/linenoise.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Copyright 2012-2014 FireZone
+# Copyright 2012-2014 Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/config/software/m4.rb b/omnibus/config/software/m4.rb
index 57bfaa862..a77f4ebd6 100644
--- a/omnibus/config/software/m4.rb
+++ b/omnibus/config/software/m4.rb
@@ -24,7 +24,7 @@ skip_transitive_dependency_licensing true
version("1.4.18") { source sha256: "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab" }
-source url: "https://mirrors.ocf.berkeley.edu/gnu/m4/m4-#{version}.tar.gz"
+source url: "https://mirrors.kernel.org/gnu/m4/m4-#{version}.tar.gz"
relative_path "m4-#{version}"
diff --git a/omnibus/config/software/ncurses.rb b/omnibus/config/software/ncurses.rb
index f9560733d..4a1f049f9 100644
--- a/omnibus/config/software/ncurses.rb
+++ b/omnibus/config/software/ncurses.rb
@@ -35,7 +35,7 @@ version("6.2") { source sha256: "30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227
version("6.1") { source sha256: "aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17" }
version("5.9") { source sha256: "9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b" }
-source url: "https://mirrors.ocf.berkeley.edu/gnu/ncurses/ncurses-#{version}.tar.gz"
+source url: "https://mirrors.kernel.org/gnu/ncurses/ncurses-#{version}.tar.gz"
relative_path "ncurses-#{version}"
diff --git a/omnibus/config/software/nftables.rb b/omnibus/config/software/nftables.rb
index 971a7368f..2c3a393b8 100644
--- a/omnibus/config/software/nftables.rb
+++ b/omnibus/config/software/nftables.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Copyright:: FireZone
+# Copyright:: Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/config/software/wireguard-tools.rb b/omnibus/config/software/wireguard-tools.rb
index 253e9dfdc..f5889af54 100644
--- a/omnibus/config/software/wireguard-tools.rb
+++ b/omnibus/config/software/wireguard-tools.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Copyright 2021 FireZone
+# Copyright 2021 Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/cookbooks/firezone/files/default/ctl-commands/reset_network.rb b/omnibus/cookbooks/firezone/files/default/ctl-commands/reset_network.rb
index a3c75167d..6fe333a44 100644
--- a/omnibus/cookbooks/firezone/files/default/ctl-commands/reset_network.rb
+++ b/omnibus/cookbooks/firezone/files/default/ctl-commands/reset_network.rb
@@ -3,7 +3,7 @@
require "mixlib/shellout"
add_command "reset_network", "Resets nftables, WireGuard interface, "\
- "and routing table back to FireZone defaults", 1 do
+ "and routing table back to Firezone defaults", 1 do
command = %W(
chef-client
-z
diff --git a/omnibus/cookbooks/firezone/files/default/ctl-commands/version.rb b/omnibus/cookbooks/firezone/files/default/ctl-commands/version.rb
index 9f97d0da3..f67a0c1a8 100644
--- a/omnibus/cookbooks/firezone/files/default/ctl-commands/version.rb
+++ b/omnibus/cookbooks/firezone/files/default/ctl-commands/version.rb
@@ -1,6 +1,6 @@
#
# Copyright:: Copyright (c) 2019 Chef Software, Inc.
-# Copyright:: Copyright (c) 2021 FireZone, Inc.
+# Copyright:: Copyright (c) 2021 Firezone, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/cookbooks/firezone/libraries/config.rb b/omnibus/cookbooks/firezone/libraries/config.rb
index 4ef5a827c..d00542af9 100644
--- a/omnibus/cookbooks/firezone/libraries/config.rb
+++ b/omnibus/cookbooks/firezone/libraries/config.rb
@@ -70,42 +70,42 @@ class Firezone
Chef::Log.warn 'Using secret_key_base from firezone.json. This value should really be managed in secrets.json. Writing to secrets.json.'
node['firezone']['secret_key_base']
else
- Chef::Log.warn 'No secret_key_base set! Generating and writing one to secrets.json. If this FireZone installation has multiple hosts, you must duplicate the secrets.json file exactly across all hosts.'
+ Chef::Log.warn 'No secret_key_base set! Generating and writing one to secrets.json. If this Firezone installation has multiple hosts, you must duplicate the secrets.json file exactly across all hosts.'
SecureRandom.base64(48)
end
live_view_signing_salt = if node['firezone'] && node['firezone']['live_view_signing_salt']
Chef::Log.warn 'Using live_view_signing_salt from firezone.json. This value should really be managed in secrets.json. Writing to secrets.json.'
node['firezone']['live_view_signing_salt']
else
- Chef::Log.warn 'No live_view_signing_salt set! Generating and writing one to secrets.json. If this FireZone installation has multiple hosts, you must duplicate the secrets.json file exactly across all hosts.'
+ Chef::Log.warn 'No live_view_signing_salt set! Generating and writing one to secrets.json. If this Firezone installation has multiple hosts, you must duplicate the secrets.json file exactly across all hosts.'
SecureRandom.base64(24)
end
cookie_signing_salt = if node['firezone'] && node['firezone']['cookie_signing_salt']
Chef::Log.warn 'Using cookie_signing_salt from firezone.json. This value should really be managed in secrets.json. Writing to secrets.json.'
node['firezone']['cookie_signing_salt']
else
- Chef::Log.warn 'No cookie_signing_salt set! Generating and writing one to secrets.json. If this FireZone installation has multiple hosts, you must duplicate the secrets.json file exactly across all hosts.'
+ Chef::Log.warn 'No cookie_signing_salt set! Generating and writing one to secrets.json. If this Firezone installation has multiple hosts, you must duplicate the secrets.json file exactly across all hosts.'
SecureRandom.base64(6)
end
wireguard_private_key = if node['firezone'] && node['firezone']['wireguard_private_key']
Chef::Log.warn 'Using wireguard_private_key from firezone.json. This value should really be managed in secrets.json. Writing to secrets.json.'
node['firezone']['wireguard_private_key']
else
- Chef::Log.warn 'No wireguard_private_key set! Generating and writing one to secrets.json. If this FireZone installation has multiple hosts, you must duplicate the secrets.json file exactly across all hosts.'
+ Chef::Log.warn 'No wireguard_private_key set! Generating and writing one to secrets.json. If this Firezone installation has multiple hosts, you must duplicate the secrets.json file exactly across all hosts.'
`#{node['firezone']['install_directory']}/embedded/bin/wg genkey`.chomp
end
database_encryption_key = if node['firezone'] && node['firezone']['database_encryption_key']
Chef::Log.warn 'Using database_encryption_key from firezone.json. This value should really be managed in secrets.json. Writing to secrets.json.'
node['firezone']['database_encryption_key']
else
- Chef::Log.warn 'No database_encryption_key set! Generating and writing one to secrets.json. If this FireZone installation has multiple hosts, you must duplicate the secrets.json file exactly across all hosts.'
+ Chef::Log.warn 'No database_encryption_key set! Generating and writing one to secrets.json. If this Firezone installation has multiple hosts, you must duplicate the secrets.json file exactly across all hosts.'
SecureRandom.base64(32)
end
default_admin_password = if node['firezone'] && node['firezone']['default_admin_password']
Chef::Log.warn 'Using default_admin_password from firezone.json. This value should really be managed in secrets.json. Writing to secrets.json.'
node['firezone']['default_admin_password']
else
- Chef::Log.warn 'No default_admin_password set! Generating and writing one to secrets.json. If this FireZone installation has multiple hosts, you must duplicate the secrets.json file exactly across all hosts.'
+ Chef::Log.warn 'No default_admin_password set! Generating and writing one to secrets.json. If this Firezone installation has multiple hosts, you must duplicate the secrets.json file exactly across all hosts.'
SecureRandom.base64(8)
end
diff --git a/omnibus/cookbooks/firezone/metadata.rb b/omnibus/cookbooks/firezone/metadata.rb
index 700c18724..9259be365 100644
--- a/omnibus/cookbooks/firezone/metadata.rb
+++ b/omnibus/cookbooks/firezone/metadata.rb
@@ -1,5 +1,5 @@
name 'firezone'
-maintainer 'FireZone'
+maintainer 'Firezone'
maintainer_email 'infra@firez.one'
license 'Apache-2.0'
description 'Installs/Configures firezone'
diff --git a/omnibus/cookbooks/firezone/recipes/config.rb b/omnibus/cookbooks/firezone/recipes/config.rb
index 9f43c6bd8..989dc8980 100644
--- a/omnibus/cookbooks/firezone/recipes/config.rb
+++ b/omnibus/cookbooks/firezone/recipes/config.rb
@@ -3,7 +3,7 @@
# Recipe:: config
#
# Copyright:: 2014 Chef Software, Inc.
-# Copyright:: 2021 FireZone
+# Copyright:: 2021 Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/cookbooks/firezone/recipes/create_admin.rb b/omnibus/cookbooks/firezone/recipes/create_admin.rb
index f1953a310..3326cff68 100644
--- a/omnibus/cookbooks/firezone/recipes/create_admin.rb
+++ b/omnibus/cookbooks/firezone/recipes/create_admin.rb
@@ -31,7 +31,7 @@ log 'admin_created' do
msg = <<~MSG
=================================================================================
- FireZone user created! Save this information because it will NOT be shown again.
+ Firezone user created! Save this information because it will NOT be shown again.
Use this to log into the Web UI.
diff --git a/omnibus/cookbooks/firezone/recipes/database.rb b/omnibus/cookbooks/firezone/recipes/database.rb
index cffcf966b..72fbfa49f 100644
--- a/omnibus/cookbooks/firezone/recipes/database.rb
+++ b/omnibus/cookbooks/firezone/recipes/database.rb
@@ -3,7 +3,7 @@
# Recipe:: database
#
# Copyright:: 2014 Chef Software, Inc.
-# Copyright:: 2021 FireZone
+# Copyright:: 2021 Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/cookbooks/firezone/recipes/default.rb b/omnibus/cookbooks/firezone/recipes/default.rb
index d2985a977..7dba3a531 100644
--- a/omnibus/cookbooks/firezone/recipes/default.rb
+++ b/omnibus/cookbooks/firezone/recipes/default.rb
@@ -3,7 +3,7 @@
# Cookbook:: firezone
# Recipe:: default
#
-# Copyright:: 2021, FireZone, All Rights Reserved.
+# Copyright:: 2021, Firezone, All Rights Reserved.
include_recipe "firezone::config"
include_recipe "firezone::setcap"
diff --git a/omnibus/cookbooks/firezone/recipes/network.rb b/omnibus/cookbooks/firezone/recipes/network.rb
index 762b60316..631db2631 100644
--- a/omnibus/cookbooks/firezone/recipes/network.rb
+++ b/omnibus/cookbooks/firezone/recipes/network.rb
@@ -3,10 +3,10 @@
# Cookbook:: firezone
# Recipe:: network
#
-# Copyright:: 2021, FireZone, All Rights Reserved.
+# Copyright:: 2021, Firezone, All Rights Reserved.
# Set up wireguard interface, default routes, and firewall
-# rules so that FireZone can run without a hitch.
+# rules so that Firezone can run without a hitch.
#
# This recipe basically performs the work of wg-quick without having to
# have a configuration file.
diff --git a/omnibus/cookbooks/firezone/recipes/phoenix.rb b/omnibus/cookbooks/firezone/recipes/phoenix.rb
index b9b15d106..e63fbaa70 100644
--- a/omnibus/cookbooks/firezone/recipes/phoenix.rb
+++ b/omnibus/cookbooks/firezone/recipes/phoenix.rb
@@ -4,7 +4,7 @@
# Recipe:: phoenix
#
# Copyright:: 2014 Chef Software, Inc.
-# Copyright:: 2021 FireZone
+# Copyright:: 2021 Firezone
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/omnibus/cookbooks/firezone/recipes/setcap.rb b/omnibus/cookbooks/firezone/recipes/setcap.rb
index 0a4b53310..8926bc717 100644
--- a/omnibus/cookbooks/firezone/recipes/setcap.rb
+++ b/omnibus/cookbooks/firezone/recipes/setcap.rb
@@ -3,7 +3,7 @@
# Cookbook:: firezone
# Recipe:: setcap
#
-# Copyright:: 2021, FireZone, All Rights Reserved.
+# Copyright:: 2021, Firezone, All Rights Reserved.
# Set capabilities for executables so they can be run without
# root privileges.
diff --git a/omnibus/cookbooks/firezone/templates/phoenix.nginx.conf.erb b/omnibus/cookbooks/firezone/templates/phoenix.nginx.conf.erb
index 4e8478e25..82c776e9a 100644
--- a/omnibus/cookbooks/firezone/templates/phoenix.nginx.conf.erb
+++ b/omnibus/cookbooks/firezone/templates/phoenix.nginx.conf.erb
@@ -77,7 +77,7 @@ server {
}
<% if @nginx['cache']['enable'] -%>
- # TODO: Is this useful to FireZone?
+ # TODO: Is this useful to Firezone?
location ~ ^/api/v1/cookbooks/.*/versions/.*(/download)?$ {
proxy_set_header HOST $host;
proxy_set_header X-Real-IP $remote_addr;
diff --git a/omnibus/package-scripts/firezone/postinst.old b/omnibus/package-scripts/firezone/postinst.old
index 49735869e..f45f15796 100755
--- a/omnibus/package-scripts/firezone/postinst.old
+++ b/omnibus/package-scripts/firezone/postinst.old
@@ -1,6 +1,6 @@
#!/bin/sh
set -e
-# FireZone package post-install script
+# Firezone package post-install script
#
# Perform necessary firezone setup steps
# after package is installed.
@@ -18,7 +18,7 @@ set -e
#
# set_capabilities()
# {
-# # Allow FireZone to control wireguard interface and firewall
+# # Allow Firezone to control wireguard interface and firewall
# setcap cap_net_raw,cap_net_admin+eip ${install_dir}/embedded/bin/wg
# setcap cap_net_raw,cap_net_admin+eip ${install_dir}/embedded/bin/nft
# }
@@ -67,7 +67,7 @@ set -e
# chown firezone:root ${install_dir}/embedded/etc/firezone/secret
# chmod 770 ${install_dir}/embedded/etc/firezone/secret
#
-# # Write FireZone SSL files
+# # Write Firezone SSL files
# ssl_key_file=${install_dir}/embedded/etc/firezone/secret/key.pem
# ssl_cert_file=${install_dir}/embedded/etc/firezone/cert.pem
# hostname=$(hostname)
@@ -86,14 +86,14 @@ set -e
# db_key="$(openssl rand -base64 32)"
# wg_server_key="$(wg genkey)"
#
-# # Write FireZone config file
+# # Write Firezone config file
# if [ -f ${install_dir}/embedded/etc/firezone/secret/secrets.env ]; then
# echo "config file exists; not creating"
# else
#
# umask 037
# cat <
${install_dir}/embedded/etc/firezone/secret/secrets.env
-# # This file is loaded into FireZone's Environment upon launch to configure it.
+# # This file is loaded into Firezone's Environment upon launch to configure it.
#
# # Warning: changing anything here can result in data loss. Make sure you know
# # what you're doing!
diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh
index 5381931bc..8a5805364 100755
--- a/scripts/uninstall.sh
+++ b/scripts/uninstall.sh
@@ -1,5 +1,4 @@
#!/bin/sh
-set -ex
echo 'Removing all Firezone configuration data...'
firezone-ctl cleanse yes