diff --git a/cookbooks/colab/recipes/default.rb b/cookbooks/colab/recipes/default.rb index c4577ef..c568ae1 100644 --- a/cookbooks/colab/recipes/default.rb +++ b/cookbooks/colab/recipes/default.rb @@ -19,6 +19,12 @@ directory '/var/log/colab' do mode 0755 end +directory '/var/lock/colab' do + owner 'root' + group 'colab' + mode 0755 +end + execute 'secret-key' do f = '/etc/colab/secret.key' command "openssl rand -hex 32 -out #{f} && chown root:colab #{f} && chmod 0640 #{f}" @@ -54,6 +60,7 @@ template '/etc/colab/settings.d/02-logging.yaml' do notifies :restart, 'service[colab]' end + directory '/var/lib/colab-assets/spb/' do owner 'root' group 'root' @@ -72,6 +79,11 @@ cookbook_file '/var/lib/colab-assets/spb/fav.ico' do mode 0644 end +# Add mailman group to colab user +execute 'colab-mailman-group' do + command "usermod -a -G mailman colab" +end + execute 'colab-admin migrate' execute 'colab-admin:collectstatic' do command 'colab-admin collectstatic --noinput' diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb index 38258f1..b8ca4ac 100644 --- a/cookbooks/mailman/recipes/default.rb +++ b/cookbooks/mailman/recipes/default.rb @@ -54,6 +54,11 @@ file '/etc/postfix/postfix-to-mailman-centos.py' do action :delete end +# Add mailman group to nginx user +execute 'nginx-mailman-group' do + command "usermod -a -G mailman nginx" +end + cookbook_file '/usr/lib/mailman/bin/postfix-to-mailman.py' do owner 'root' group 'root' -- libgit2 0.21.2