Commit 4575daa67f02bb4c12f79289e9fff244dd489eb4
Committed by
Sergio Oliveira
Sergio Oliveira
1 parent
a17d49fb
Exists in
master
and in
79 other branches
Removing colab forced restart from chef
Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
Showing
1 changed file
with
9 additions
and
8 deletions
Show diff stats
cookbooks/colab/recipes/default.rb
| @@ -96,28 +96,28 @@ template '/etc/colab/settings.d/02-logging.py' do | @@ -96,28 +96,28 @@ template '/etc/colab/settings.d/02-logging.py' do | ||
| 96 | owner 'root' | 96 | owner 'root' |
| 97 | group 'colab' | 97 | group 'colab' |
| 98 | mode 0640 | 98 | mode 0640 |
| 99 | + notifies :restart, 'service[colab]' | ||
| 99 | end | 100 | end |
| 100 | 101 | ||
| 101 | template '/etc/colab/settings.d/03-sentry.py' do | 102 | template '/etc/colab/settings.d/03-sentry.py' do |
| 102 | owner 'root' | 103 | owner 'root' |
| 103 | group 'colab' | 104 | group 'colab' |
| 104 | mode 0640 | 105 | mode 0640 |
| 106 | + notifies :restart, 'service[colab]' | ||
| 105 | end | 107 | end |
| 106 | 108 | ||
| 107 | template '/etc/colab/settings.d/04-memcached.py' do | 109 | template '/etc/colab/settings.d/04-memcached.py' do |
| 108 | owner 'root' | 110 | owner 'root' |
| 109 | group 'colab' | 111 | group 'colab' |
| 110 | mode 0640 | 112 | mode 0640 |
| 113 | + notifies :restart, 'service[colab]' | ||
| 111 | end | 114 | end |
| 112 | 115 | ||
| 113 | template '/etc/colab/settings.d/05-celery.py' do | 116 | template '/etc/colab/settings.d/05-celery.py' do |
| 114 | owner 'root' | 117 | owner 'root' |
| 115 | group 'colab' | 118 | group 'colab' |
| 116 | mode 0640 | 119 | mode 0640 |
| 117 | -end | ||
| 118 | - | ||
| 119 | -service 'colab' do | ||
| 120 | - action :restart | 120 | + notifies :restart, 'service[colab]' |
| 121 | end | 121 | end |
| 122 | 122 | ||
| 123 | # Adding plugins for colab | 123 | # Adding plugins for colab |
| @@ -134,32 +134,33 @@ template '/etc/colab/plugins.d/gitlab.py' do | @@ -134,32 +134,33 @@ template '/etc/colab/plugins.d/gitlab.py' do | ||
| 134 | variables( | 134 | variables( |
| 135 | :get_private_token => get_private_token | 135 | :get_private_token => get_private_token |
| 136 | ) | 136 | ) |
| 137 | + | ||
| 138 | + notifies :restart, 'service[colab]' | ||
| 137 | end | 139 | end |
| 138 | 140 | ||
| 139 | template '/etc/colab/plugins.d/noosfero.py' do | 141 | template '/etc/colab/plugins.d/noosfero.py' do |
| 140 | owner 'root' | 142 | owner 'root' |
| 141 | group 'colab' | 143 | group 'colab' |
| 142 | mode 0640 | 144 | mode 0640 |
| 145 | + notifies :restart, 'service[colab]' | ||
| 143 | end | 146 | end |
| 144 | 147 | ||
| 145 | template '/etc/colab/plugins.d/spb.py' do | 148 | template '/etc/colab/plugins.d/spb.py' do |
| 146 | owner 'root' | 149 | owner 'root' |
| 147 | group 'colab' | 150 | group 'colab' |
| 148 | mode 0640 | 151 | mode 0640 |
| 152 | + notifies :restart, 'service[colab]' | ||
| 149 | end | 153 | end |
| 150 | 154 | ||
| 151 | template '/etc/colab/plugins.d/raven.py' do | 155 | template '/etc/colab/plugins.d/raven.py' do |
| 152 | owner 'root' | 156 | owner 'root' |
| 153 | group 'colab' | 157 | group 'colab' |
| 154 | mode 0640 | 158 | mode 0640 |
| 159 | + notifies :restart, 'service[colab]' | ||
| 155 | end | 160 | end |
| 156 | 161 | ||
| 157 | execute 'colab-admin migrate' | 162 | execute 'colab-admin migrate' |
| 158 | 163 | ||
| 159 | -service 'colab' do | ||
| 160 | - action :restart | ||
| 161 | -end | ||
| 162 | - | ||
| 163 | # Static files | 164 | # Static files |
| 164 | directory '/var/lib/colab-assets/spb/' do | 165 | directory '/var/lib/colab-assets/spb/' do |
| 165 | owner 'root' | 166 | owner 'root' |