Fixed code styling

This commit is contained in:
Greg Karékinian
2017-04-28 15:42:18 +02:00
parent 4641e77438
commit 2f0ff1f559
16 changed files with 130 additions and 133 deletions

View File

@@ -19,10 +19,10 @@ end
postgresql_database 'mastodon' do
connection(
:host => '127.0.0.1',
:port => 5432,
:username => 'postgres',
:password => node['postgresql']['password']['postgres']
host: '127.0.0.1',
port: 5432,
username: 'postgres',
password: node['postgresql']['password']['postgres']
)
action :create
end
@@ -70,7 +70,7 @@ application mastodon_path do
otp_secret: mastodon_credentials['otp_secret'],
smtp_login: mastodon_credentials['smtp_user_name'],
smtp_password: mastodon_credentials['smtp_password'],
smtp_from_address: "mail@#{node["kosmos-mastodon"]["server_name"]}",
smtp_from_address: "mail@#{node['kosmos-mastodon']['server_name']}",
s3_bucket: "kosmos-social",
aws_access_key_id: mastodon_credentials['aws_access_key_id'],
aws_secret_access_key: mastodon_credentials['aws_secret_access_key'],
@@ -91,7 +91,7 @@ application mastodon_path do
bundle_install do
user "mastodon"
deployment true
without %w{development test}
without %w(development test)
end
npm_install do

View File

@@ -42,7 +42,6 @@ unless node.chef_environment == "development"
command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path /var/www/mastodon -d #{server_name} -n"
cwd "/usr/local/certbot"
not_if { File.exist? "/etc/letsencrypt/live/#{server_name}/fullchain.pem" }
notifies :reload, "service[nginx]", :delayed
notifies :create, "template[#{node['nginx']['dir']}/sites-available/mastodon]", :immediately
end
end