diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2016-06-21 18:10:03 +0200 |
|---|---|---|
| committer | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-06-21 18:10:03 +0200 |
| commit | 8aed1c0a753747de0dba44d5bf52b780f3abd5ab (patch) | |
| tree | 724fe5e4cfd153eb1db67baa505939bed3bae7df | |
| parent | d4b2e8fa68c31dc2f056b8c8e4e5816cbed907bf (diff) | |
Aressem/add systemd scripts to rpm spec (#140)
* Add generated service files for systemd integration.
* vespa core dumper in wrong location.
| -rw-r--r-- | dist/vespa.spec | 6 | ||||
| -rw-r--r-- | vespabase/CMakeLists.txt | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 290472987fc..065317cb995 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -130,6 +130,10 @@ ln -s %{_prefix}/lib/jars/zkfacade-jar-with-dependencies.jar %{buildroot}/%{_pre ln -s %{_prefix}/conf/configserver-app/components %{buildroot}/%{_prefix}/lib/jars/config-models ln -s storaged-bin %{buildroot}/%{_prefix}/sbin/distributord-bin +mkdir -p %{buildroot}/usr/lib/systemd/service +cp %{buildroot}/%{_prefix}/etc/systemd/system/vespa.service %{buildroot}/usr/lib/systemd/service +cp %{buildroot}/%{_prefix}/etc/systemd/system/vespa-configserver.service %{buildroot}/usr/lib/systemd/service + %clean rm -rf $RPM_BUILD_ROOT @@ -203,5 +207,7 @@ exit 0 %{_prefix}/etc/* %{_prefix}/conf/* %{_prefix}/share/vespa/schema/* +/usr/lib/systemd/system/vespa.service +/usr/lib/systemd/system/vespa-configserver.service %changelog diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index 8857325546b..75e3537506d 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -35,9 +35,10 @@ vespa_install_script(src/vespa-start-configserver.sh vespa-start-configserver bi vespa_install_script(src/vespa-start-services.sh vespa-start-services bin) vespa_install_script(src/vespa-stop-configserver.sh vespa-stop-configserver bin) vespa_install_script(src/vespa-stop-services.sh vespa-stop-services bin) -vespa_install_script(vespa-core-dumper.sh vespa-core-dumper bin) +vespa_install_script(src/vespa-core-dumper.sh vespa-core-dumper bin) configure_file(src/vespa.service.in src/vespa.service @ONLY) configure_file(src/vespa-configserver.service.in src/vespa-configserver.service @ONLY) +install(FILES src/vespa.service src/vespa-configserver.service DESTINATION etc/systemd/system) install(FILES src/Defaults.pm DESTINATION lib/perl5/site_perl/Yahoo/Vespa) |