Commit 6d98bb76d6dc4754bf7976c78c0d9f4e23fa9c07
Committed by
Sergio Oliveira
1 parent
02ac4adc
Exists in
master
and in
79 other branches
Update colab default recipes: adding memcached and redis templates
Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Paulo Tada <paulohtfs@gmail.com>
Showing
1 changed file
with
21 additions
and
6 deletions
Show diff stats
cookbooks/colab/recipes/default.rb
| @@ -106,18 +106,33 @@ template '/etc/colab/settings.d/01-apps.yaml' do | @@ -106,18 +106,33 @@ template '/etc/colab/settings.d/01-apps.yaml' do | ||
| 106 | ) | 106 | ) |
| 107 | end | 107 | end |
| 108 | 108 | ||
| 109 | +# Adding settings.d files | ||
| 109 | template '/etc/colab/settings.d/02-logging.py' do | 110 | template '/etc/colab/settings.d/02-logging.py' do |
| 110 | owner 'root' | 111 | owner 'root' |
| 111 | group 'colab' | 112 | group 'colab' |
| 112 | mode 0640 | 113 | mode 0640 |
| 113 | - notifies :restart, 'service[colab]' | ||
| 114 | end | 114 | end |
| 115 | 115 | ||
| 116 | template '/etc/colab/settings.d/03-sentry.py' do | 116 | template '/etc/colab/settings.d/03-sentry.py' do |
| 117 | owner 'root' | 117 | owner 'root' |
| 118 | group 'colab' | 118 | group 'colab' |
| 119 | mode 0640 | 119 | mode 0640 |
| 120 | - notifies :restart, 'service[colab]' | 120 | +end |
| 121 | + | ||
| 122 | +template '/etc/colab/settings.d/memcached.py' do | ||
| 123 | + owner 'root' | ||
| 124 | + group 'colab' | ||
| 125 | + mode 0640 | ||
| 126 | +end | ||
| 127 | + | ||
| 128 | +template '/etc/colab/settings.d/redis.py' do | ||
| 129 | + owner 'root' | ||
| 130 | + group 'colab' | ||
| 131 | + mode 0640 | ||
| 132 | +end | ||
| 133 | + | ||
| 134 | +service 'colab' do | ||
| 135 | + action :restart | ||
| 121 | end | 136 | end |
| 122 | 137 | ||
| 123 | # Adding plugins for colab | 138 | # Adding plugins for colab |
| @@ -125,25 +140,25 @@ template '/etc/colab/plugins.d/gitlab.py' do | @@ -125,25 +140,25 @@ template '/etc/colab/plugins.d/gitlab.py' do | ||
| 125 | owner 'root' | 140 | owner 'root' |
| 126 | group 'colab' | 141 | group 'colab' |
| 127 | mode 0640 | 142 | mode 0640 |
| 128 | - notifies :restart, 'service[colab]' | ||
| 129 | end | 143 | end |
| 130 | 144 | ||
| 131 | template '/etc/colab/plugins.d/noosfero.py' do | 145 | template '/etc/colab/plugins.d/noosfero.py' do |
| 132 | owner 'root' | 146 | owner 'root' |
| 133 | group 'colab' | 147 | group 'colab' |
| 134 | mode 0640 | 148 | mode 0640 |
| 135 | - notifies :restart, 'service[colab]' | ||
| 136 | end | 149 | end |
| 137 | 150 | ||
| 138 | template '/etc/colab/plugins.d/spb.py' do | 151 | template '/etc/colab/plugins.d/spb.py' do |
| 139 | owner 'root' | 152 | owner 'root' |
| 140 | group 'colab' | 153 | group 'colab' |
| 141 | mode 0640 | 154 | mode 0640 |
| 142 | - notifies :restart, 'service[colab]' | ||
| 143 | end | 155 | end |
| 144 | 156 | ||
| 145 | execute 'colab-admin migrate' | 157 | execute 'colab-admin migrate' |
| 146 | -# End adding plugins for colab | 158 | + |
| 159 | +service 'colab' do | ||
| 160 | + action :restart | ||
| 161 | +end | ||
| 147 | 162 | ||
| 148 | directory '/var/lib/colab-assets/spb/' do | 163 | directory '/var/lib/colab-assets/spb/' do |
| 149 | owner 'root' | 164 | owner 'root' |