8 Commits

Author SHA1 Message Date
Greg Karékinian
94330f2052 Comment out the COOKIE_SECURE config for now
We will enable it again after we have a valid TLS cert generated with
Let's Encrypt. It prevents logins using http, and we will need that as
an admin account
2020-05-28 18:43:31 +02:00
Greg Karékinian
baaae695af Merge branch 'master' into feature/147-gitea_cookbook 2020-05-28 15:44:44 +02:00
5b2d4f269d Merge branch 'bugfix/171-letsencrypt_resource' of kosmos/chef into master 2020-05-26 15:25:27 +00:00
Greg Karékinian
210c76c479 Fix the name of the Let's Encrypt cert execute resource
The resource in the notification was invalid, missing the type of
resource (execute)

Fixes #171
2020-05-26 14:10:47 +02:00
6469d2286e Merge branch 'feature/zoom_options' of kosmos/chef into master 2020-05-25 15:52:41 +00:00
9dec1cfce8 Merge branch 'chore/mastodon_system_deps' of kosmos/chef into master 2020-05-25 15:50:58 +00:00
5fcb047505 Update Mastodon system dependencies
Needs new Ruby, and why not upgrade Yarn in the process. Running in
production.
2020-05-25 17:49:22 +02:00
f92b43e0f4 Configure Zoom meeting whitelist
So we only log contributions for actual Kosmos calls
2020-05-25 16:57:09 +02:00
5 changed files with 9 additions and 6 deletions

View File

@@ -108,7 +108,8 @@
"kosmos-base::letsencrypt",
"git::default",
"git::package",
"build-essential::default"
"build-essential::default",
"poise-git::default"
],
"platform": "ubuntu",
"platform_version": "18.04",

View File

@@ -157,7 +157,7 @@ done
end
nginx_certbot_site new_resource.hostname do
notifies :run, "letsencrypt cert for #{domain}", :delayed
notifies :run, "execute[letsencrypt cert for #{domain}]", :delayed
end
# Generate a Let's Encrypt cert (only if the nginx vhost exists and no cert

View File

@@ -120,7 +120,8 @@ application app_path do
"KREDITS_SESSION_SECRET" => data_bag['kredits_session_secret'],
"KREDITS_GITHUB_KEY" => data_bag['kredits_github_key'],
"KREDITS_GITHUB_SECRET" => data_bag['kredits_github_secret'],
"KREDITS_ZOOM_JWT" => data_bag['kredits_zoom_jwt']
"KREDITS_ZOOM_JWT" => data_bag['kredits_zoom_jwt'],
"KREDITS_ZOOM_MEETING_WHITELIST" => "414901303"
}
)
notifies :run, "execute[systemctl daemon-reload]", :delayed

View File

@@ -79,10 +79,10 @@ package %w(imagemagick ffmpeg libxml2-dev libxslt1-dev file git curl pkg-config
libprotobuf-dev protobuf-compiler libidn11 libidn11-dev libjemalloc1)
npm_package "yarn" do
version "1.17.3"
version "1.22.4"
end
ruby_version = "2.6.5"
ruby_version = "2.6.6"
execute "systemctl daemon-reload" do
command "systemctl daemon-reload"

View File

@@ -30,7 +30,8 @@ SSL_MODE = verify-ca
[session]
PROVIDER = file
PROVIDER_CONFIG = sessions
COOKIE_SECURE = true
# Enable when TLS is enabled
# COOKIE_SECURE = true
[mailer]
ENABLED = true