diff --git a/hiawatha.changes b/hiawatha.changes index 883e6a0..57d949e 100644 --- a/hiawatha.changes +++ b/hiawatha.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 13 22:56:19 UTC 2013 - fisiu@opensuse.org + +- Don't use cutom pid file in systemd service. +- Fix logrotate config. +- Spec cleanup. + ------------------------------------------------------------------- Thu Aug 1 19:39:47 UTC 2013 - fisiu@opensuse.org diff --git a/hiawatha.logrotate b/hiawatha.logrotate index da56844..8d81f42 100644 --- a/hiawatha.logrotate +++ b/hiawatha.logrotate @@ -8,6 +8,6 @@ missingok create 640 wwwrun www postrotate - /etc/init.d/hiawatha force-reload + systemctl reload-or-try-restart hiawatha.service endscript } diff --git a/hiawatha.service b/hiawatha.service index bb04ea1..b866386 100644 --- a/hiawatha.service +++ b/hiawatha.service @@ -4,10 +4,9 @@ After=network.target [Service] Type=simple -PIDFile=/var/run/hiawatha.pid SyslogIdentifier=hiawatha ExecStartPre=/usr/sbin/wigwam ; /usr/sbin/hiawatha -k -ExecStart= /usr/sbin/hiawatha -d +ExecStart=/usr/sbin/hiawatha -d [Install] WantedBy=multi-user.target diff --git a/hiawatha.spec b/hiawatha.spec index 0e223ee..db66b43 100644 --- a/hiawatha.spec +++ b/hiawatha.spec @@ -34,8 +34,6 @@ BuildRequires: cmake >= 2.8.4 BuildRequires: pkg-config BuildRequires: systemd BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %fillup_prereq -PreReq: %insserv_prereq Requires: logrotate %{?systemd_requires} @@ -98,10 +96,6 @@ rm -vf %{buildroot}%{_libdir}/%{name}/libpolarssl.so %post %service_add_post %{name}.service -echo -echo "To activate the service, run as root" -echo "# systemctl enable %{name}.service" -echo %preun %service_del_preun %{name}.service