Add Tor, configure hidden service for Mastodon #95

Merged
raucao merged 7 commits from feature/tor_hidden_services into master 2019-09-09 11:38:29 +00:00
5 changed files with 15 additions and 0 deletions
Showing only changes of commit 0d20cddbf5 - Show all commits

View File

@ -52,3 +52,6 @@ cookbook 'mariadb', '= 0.3.1'
cookbook 'ipfs',
git: 'https://github.com/67P/ipfs-cookbook.git',
ref: 'v0.4.1'
cookbook 'tor-full',
git: 'https://github.com/sliim-cookbooks/tor-full.git',
ref: 'custom'

View File

@ -51,6 +51,10 @@ DEPENDENCIES
revision: 7476279fc9c8727f082b8d77b5e1922dc2ef437b
ref: v0.5.6
timezone_iii (= 1.0.4)
tor-full
git: https://github.com/sliim-cookbooks/tor-full.git
revision: a3e965b460745a6bd66dcf9a853d4b3d8845ac8a
ref: custom
users (~> 5.3.1)
GRAPH
@ -159,6 +163,9 @@ GRAPH
seven_zip (3.1.1)
windows (>= 0.0.0)
timezone_iii (1.0.4)
tor-full (0.2.0)
apt (>= 0.0.0)
yum (>= 0.0.0)
users (5.3.1)
windows (6.0.0)
yum (5.1.0)

View File

@ -4,3 +4,6 @@ node.default["kosmos-mastodon"]["streaming_port"] = 4000
node.default["kosmos-mastodon"]["server_name"] = "kosmos.social"
node.default["kosmos-mastodon"]["redis_url"] = "redis://localhost:6379/1"
node.default["kosmos-mastodon"]["sidekiq_threads"] = 25
node.default["tor"]["HiddenServices"]["mastodon"] = {
Review

Same thing as in site-cookbooks/kosmos-ejabberd/attributes/default.rb

Same thing as in `site-cookbooks/kosmos-ejabberd/attributes/default.rb`
"HiddenServicePorts" => ["80 127.0.0.1:80"]
}

View File

@ -15,3 +15,4 @@ depends "application_javascript"
depends "postgresql"
depends "kosmos-postgresql"
depends "backup"
depends "tor-full"

View File

@ -28,6 +28,7 @@ mastodon_path = node["kosmos-mastodon"]["directory"]
server_name = node["kosmos-mastodon"]["server_name"]
include_recipe "kosmos-nginx"
include_recipe "tor-full"
template "#{node['nginx']['dir']}/sites-available/#{server_name}" do
source 'nginx_conf_mastodon.erb'