Skip to content

Commit

Permalink
[dist] fixed hardlinking problem in SLE 11
Browse files Browse the repository at this point in the history
  • Loading branch information
M0ses committed Dec 4, 2015
1 parent 5cb3797 commit ff78c71
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dist/Makefile
Expand Up @@ -26,7 +26,7 @@ install_project_update: system_dirs


install_logrotate: system_dirs
$(foreach config,$(LOGROTATE_CONFIGS),$(shell $(INSTALL) -m 755 $(config).logrotate $(DESTDIR)/etc/logrotate.d/$(config)) )
$(foreach config,$(LOGROTATE_CONFIGS),$(shell $(INSTALL) -m 644 $(config).logrotate $(DESTDIR)/etc/logrotate.d/$(config)) )

install_fillups: system_dirs
$(INSTALL) -m 0644 sysconfig.obs-server $(DESTDIR)/var/adm/fillup-templates/
Expand Down
6 changes: 4 additions & 2 deletions src/api/Makefile
Expand Up @@ -56,9 +56,11 @@ build: config
$(OBS_API_BUNDLER_OPTS) bundle config --local frozen 1 ;\
$(OBS_API_BUNDLER_OPTS) bundle config --local without test:assets:development
# reinstall
$(INSTALL) config/database.yml.example $(DESTDIR)/srv/www/obs/api/config/database.yml
$(INSTALL) config/database.yml.example $(DESTDIR)$(OBS_API_PREFIX)/config/database.yml
# fixed hardlinking problem in SLE 11
echo "# This is to prevent fdupes from hardlinking" >> $(DESTDIR)$(OBS_API_PREFIX)/config/database.yml
: > $(DESTDIR)/srv/www/obs/api/log/production.log
sed -i -e 's,^api_version.*,api_version = "%version",' $(DESTDIR)/srv/www/obs/api/config/initializers/02_apiversion.rb
sed -i -e 's,^api_version.*,api_version = "%version",' $(DESTDIR)$(OBS_API_PREFIX)/config/initializers/02_apiversion.rb

test_unit:
./script/api_test_in_spec.sh
Expand Down

0 comments on commit ff78c71

Please sign in to comment.