File tree Expand file tree Collapse file tree 1 file changed +6
-64
lines changed Expand file tree Collapse file tree 1 file changed +6
-64
lines changed Original file line number Diff line number Diff line change @@ -25,77 +25,19 @@ enable_obs_workers:
25
25
- repl: ' ENABLED=1'
26
26
- count: 1
27
27
28
- patch1_obs_api_gemfile_lock:
28
+ {% if salt[' grains.get' ](' api_setup' ) != ' done' %}
29
+ setup_obs_api:
29
30
cmd.run :
30
- - name: sed -i 's/sass (3.4.22)/sass (3.4.23)/' /usr/share/obs/api/Gemfile.lock
31
-
32
- patch2_obs_api_gemfile:
33
- cmd.run :
34
- - name: sed -i 's/^group :assets do$//' /usr/share/obs/api/Gemfile
35
-
36
- patch3_obs_api_gemfile:
37
- cmd.run :
38
- - name: sed -i '93s/^end$//' /usr/share/obs/api/Gemfile
39
-
40
- enable_apache_ssl_module:
41
- cmd.run :
42
- - name: a2enmod ssl
43
-
44
- enable_apache_headers_module:
45
- cmd.run :
46
- - name: a2enmod headers
47
-
48
- enable_apache_expires_module:
49
- cmd.run :
50
- - name: a2enmod expires
51
-
52
- disable_default_apache2_site:
53
- cmd.run :
54
- - name: a2dissite 000-default.conf
55
-
56
- enable_obs_site:
57
- cmd.run :
58
- - name: a2ensite obs
59
-
60
- # set files on log and api dir to www-data
61
- /usr/share/obs/api :
62
- file.directory :
63
- - user: www-data
64
- - group: www-data
65
- - recurse:
66
- - user
67
- - group
68
-
69
- /var/log/obs :
70
- file.directory :
71
- - user: www-data
72
- - group: www-data
73
- - recurse:
74
- - user
75
- - group
76
-
77
- {% if salt[' grains.get' ](' db_setup' ) != ' done' %}
78
- setup_database:
79
- cmd.run :
80
- - name: " RAILS_ENV=production bundle exec rake db:setup"
31
+ - name: /usr/share/obs/api/script/rake-tasks.sh setup
81
32
- cwd: /usr/share/obs/api
82
33
grains.present :
83
- - name: db_setup
34
+ - name: api_setup
84
35
- value: done
85
36
{% endif %}
86
37
87
- compile_assets:
88
- cmd.run :
89
- - name: " RAILS_ENV=production bundle exec rake assets:precompile"
90
- - cwd: /usr/share/obs/api
91
-
92
38
restart_apache:
93
39
service.running :
94
40
- name: apache2
95
41
- enable: True
96
- - watch_any:
97
- - enable_obs_site
98
- - disable_default_apache2_site
99
- - file: /var/log/obs
100
- - file: /usr/share/obs/api
101
- - compile_assets
42
+ - watch:
43
+ - setup_obs_api
You can’t perform that action at this time.
0 commit comments