From a88119a7c2ce917ec052186ec017fbe07d23bafb Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Fri, 20 Aug 2021 06:26:11 +0000 Subject: [PATCH] app tmp dir and locale --- .../cookbooks/firezone/libraries/config.rb | 20 +++++++++++++++++++ omnibus/cookbooks/firezone/recipes/config.rb | 7 +++++++ .../firezone/templates/sv-phoenix-run.erb | 1 + 3 files changed, 28 insertions(+) diff --git a/omnibus/cookbooks/firezone/libraries/config.rb b/omnibus/cookbooks/firezone/libraries/config.rb index 63c8c3c89..32ba428c2 100644 --- a/omnibus/cookbooks/firezone/libraries/config.rb +++ b/omnibus/cookbooks/firezone/libraries/config.rb @@ -26,6 +26,26 @@ class Firezone Chef::Log.warn "Could not create #{filename}: #{e}" end + def self.locale_variables + <<~LOCALE + export LANG=en_US.UTF-8 + export LANGUAGE=en_US + export LC_CTYPE="en_US.UTF-8" + export LC_NUMERIC="en_US.UTF-8" + export LC_TIME="en_US.UTF-8" + export LC_COLLATE="en_US.UTF-8" + export LC_MONETARY="en_US.UTF-8" + export LC_MESSAGES="en_US.UTF-8" + export LC_PAPER="en_US.UTF-8" + export LC_NAME="en_US.UTF-8" + export LC_ADDRESS="en_US.UTF-8" + export LC_TELEPHONE="en_US.UTF-8" + export LC_MEASUREMENT="en_US.UTF-8" + export LC_IDENTIFICATION="en_US.UTF-8" + export LC_ALL="en_US.UTF-8" + LOCALE + end + # Read in a JSON file for attributes and consume them def self.load_from_json!(filename, node) create_directory!(filename) diff --git a/omnibus/cookbooks/firezone/recipes/config.rb b/omnibus/cookbooks/firezone/recipes/config.rb index a2365a446..5ff6b0b5c 100644 --- a/omnibus/cookbooks/firezone/recipes/config.rb +++ b/omnibus/cookbooks/firezone/recipes/config.rb @@ -60,6 +60,13 @@ directory node['firezone']['var_directory'] do recursive true end +directory "#{node['firezone']['app_directory']}/tmp" do + owner node['firezone']['user'] + group node['firezone']['group'] + mode '0700' + recursive true +end + directory node['firezone']['log_directory'] do owner node['firezone']['user'] group node['firezone']['group'] diff --git a/omnibus/cookbooks/firezone/templates/sv-phoenix-run.erb b/omnibus/cookbooks/firezone/templates/sv-phoenix-run.erb index f7f0185f3..7363abdd6 100644 --- a/omnibus/cookbooks/firezone/templates/sv-phoenix-run.erb +++ b/omnibus/cookbooks/firezone/templates/sv-phoenix-run.erb @@ -7,6 +7,7 @@ export DIR=<%= node['firezone']['app_directory'] %> export HOME=$DIR <%= "export OPENSSL_FIPS=1" if node['firezone']['fips_enabled'] == true %> <%= Firezone::Config.environment_variables_from(Firezone::Config.app_env(node['firezone'])) %> +<%= Firezone::Config.locale_variables %> cd $DIR