diff --git a/_servicedata b/_servicedata index 1f6e61d..4a4ea58 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/M0ses/kanku.git - a2e5bb43573ba175746f0aaf48b119805cdeb591 + 6a93c4463a78a1168af95cbbc5e78a6299cdbc6c /home/frank/prj/kanku 07fc15f0647a92f01b67085d698485d3432a8924 \ No newline at end of file diff --git a/kanku-0.3.9.git20180223.a2e5bb4.obscpio b/kanku-0.3.9.git20180223.a2e5bb4.obscpio deleted file mode 100644 index 6981eff..0000000 --- a/kanku-0.3.9.git20180223.a2e5bb4.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9da2cc0ab6d5d1f043c3b534adafed1ed8a51982bc8a770b50ea18c9080aa9c -size 7800846 diff --git a/kanku-0.4.0.git20180514.6a93c44.obscpio b/kanku-0.4.0.git20180514.6a93c44.obscpio new file mode 100644 index 0000000..bc90b08 --- /dev/null +++ b/kanku-0.4.0.git20180514.6a93c44.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74b890ad0720433081d4e379ffc0084c1b4199f1b0cdb781af729a21fbfdc7f7 +size 7846414 diff --git a/kanku.changes b/kanku.changes index 0ab52f8..f1b1153 100644 --- a/kanku.changes +++ b/kanku.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Tue May 15 06:58:33 UTC 2018 - opensuse-packaging@opensuse.org + +- Update to version 0.4.0.git20180514.6a93c44: + * [core] changed default ssl_cacert option for RabbitMQ + * [cli] local logging.conf in users home directory + * [dist] sudoers file now handled by setup + * [cli] interactive mode for devel setup + * [dist] added views/notifiers to spec + * [core] beautified email notifications + * [web] fix args for jobs + * [dist] added 'smtp_daemon' to requires for kanku-web + * [web] fixed problems with deserializer + * [core] fix bug in Kanku::NotifyQueue to request correct config section + * [web] more logging for notification websocket + * [core] fixes for new image formats + * [core] added vdi as image format + * [handler] CreateDomain: reorder installation process + * [handler] CreateDomain: configurable installation process + * [web] better error handling for guest list + * [web] display ajax errors properly + * [core] changes for boot order based on image type + * [core] new 'preferred_extension' options for OBSCheck + * [core] preparation for azure/ec2 + * [core] added vhdfixed + * [handler] ImageDownload: fixed url for history lookup + * [core] added vmdk as supported disk format + * [dist] setup for distributed mode + * [cmd] create ~/.config/osc in devel setup + * [cli] fix connect uri for console + * [dist] added Net::AMQP::RabbitMQ to kanku-cli Requires + * [dist] fix deps for NotifyQueue/* + * [cli] fixes for devel setup after refactoring + * [dist] fix db path and sudoers + * [core] major refactor to use dedicated user for daemons + * [dist] kankurun and apache2 setup + * [handler] ImageDownload - do not try to unpack if src/dst are the same + ------------------------------------------------------------------- Fri Feb 23 03:19:12 UTC 2018 - opensuse-packaging@opensuse.org diff --git a/kanku.obsinfo b/kanku.obsinfo index c256ce0..da23020 100644 --- a/kanku.obsinfo +++ b/kanku.obsinfo @@ -1,5 +1,5 @@ name: kanku -version: 0.3.9.git20180223.a2e5bb4 -mtime: 1519349744 -commit: a2e5bb43573ba175746f0aaf48b119805cdeb591 +version: 0.4.0.git20180514.6a93c44 +mtime: 1526309422 +commit: 6a93c4463a78a1168af95cbbc5e78a6299cdbc6c diff --git a/kanku.spec b/kanku.spec index 14bd194..76ca566 100644 --- a/kanku.spec +++ b/kanku.spec @@ -14,7 +14,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - +%define kanku_user kankurun +%define kanku_group kanku +%define kanku_prefix /opt/kanku +%define kanku_vardir %{kanku_prefix}/var Name: kanku # Version gets set by obs-service-tar_scm @@ -30,6 +33,7 @@ BuildRequires: perl-macros BuildRequires: fdupes BuildRequires: systemd-rpm-macros + # perl requires for %check BuildRequires: perl(DBIx::Class::Fixtures) BuildRequires: perl(Test::Simple) @@ -127,6 +131,7 @@ Recommends: osc Recommends: perl(IO::Uncompress::UnXz) Recommends: apache2 Requires: libvirt-daemon-qemu qemu-kvm libvirt-daemon-config-network libvirt-daemon-config-nwfilter +Requires: sudo Requires: perl(DBIx::Class::Fixtures) Requires: perl(Test::Simple) Requires: perl(YAML) @@ -171,6 +176,7 @@ Requires: perl-DBD-SQLite Requires: perl(LWP::Protocol::https) Requires: perl(Mail::Sendmail) Requires: perl(Archive::Cpio) +Requires: perl(UUID) Requires: logrotate Conflicts: perl-DBD-SQLite-Amalgamation @@ -184,48 +190,44 @@ TODO: %defattr(-,root,root) %doc README.md TODO -%dir /opt/kanku -%dir /opt/kanku/var -%dir /opt/kanku/var/log -%dir /opt/kanku/var/cache -%dir /opt/kanku/lib -%dir /opt/kanku/lib/Kanku -%dir /opt/kanku/lib/Kanku/Daemon +%dir %{kanku_prefix} +%dir %{kanku_prefix}/lib +%dir %{kanku_prefix}/lib/Kanku +%dir %{kanku_prefix}/lib/Kanku/Daemon # share contains database related stuff -%dir /opt/kanku/share/ -/opt/kanku/share/fixtures -/opt/kanku/share/migrations +%dir %{kanku_prefix}/share/ +%{kanku_prefix}/share/fixtures +%{kanku_prefix}/share/migrations -%dir /opt/kanku/bin -%attr(755,root,root) /opt/kanku/bin/kanku -%attr(755,root,root) /opt/kanku/bin/kanku-network-setup.pl +%dir %{kanku_prefix}/bin +%attr(755,root,root) %{kanku_prefix}/bin/kanku +%attr(755,root,root) %{kanku_prefix}/bin/kanku-network-setup.pl -%dir /opt/kanku/etc/ -%ghost /opt/kanku/etc/config.yml -%config /opt/kanku/etc/console-log.conf -%config /opt/kanku/etc/kanku-network-setup-logging.conf -%config /opt/kanku/etc/config.yml.template +%dir %{kanku_prefix}/etc/ +%ghost %{kanku_prefix}/etc/config.yml +%config %{kanku_prefix}/etc/console-log.conf +%config %{kanku_prefix}/etc/kanku-network-setup-logging.conf -%dir /opt/kanku/etc/templates -%dir /opt/kanku/etc/templates/examples-vm/ -%dir /opt/kanku/etc/templates/cmd -%config /opt/kanku/etc/templates/cmd/setup.config.yml.tt2 -%config /opt/kanku/etc/templates/cmd/init.tt2 -%config /opt/kanku/etc/templates/examples-vm/obs-server-26.tt2 -%config /opt/kanku/etc/templates/examples-vm/sles11sp3.tt2 -%config /opt/kanku/etc/templates/examples-vm/obs-server.tt2 +%dir %{kanku_prefix}/etc/templates +%dir %{kanku_prefix}/etc/templates/examples-vm/ +%dir %{kanku_prefix}/etc/templates/cmd +%dir %{kanku_prefix}/etc/templates/cmd/setup +%config %{kanku_prefix}/etc/templates/cmd/init.tt2 +%config %{kanku_prefix}/etc/templates/cmd/setup/* +%config %{kanku_prefix}/etc/templates/examples-vm/obs-server-26.tt2 +%config %{kanku_prefix}/etc/templates/examples-vm/sles11sp3.tt2 +%config %{kanku_prefix}/etc/templates/examples-vm/obs-server.tt2 -%dir /opt/kanku/etc/jobs -%dir /opt/kanku/etc/jobs/examples -%config /opt/kanku/etc/jobs/examples/obs-server.yml -%config /opt/kanku/etc/jobs/examples/obs-server-26.yml -%config /opt/kanku/etc/jobs/examples/sles11sp3.yml +%dir %{kanku_prefix}/etc/jobs +%dir %{kanku_prefix}/etc/jobs/examples +%config %{kanku_prefix}/etc/jobs/examples/obs-server.yml +%config %{kanku_prefix}/etc/jobs/examples/obs-server-26.yml +%config %{kanku_prefix}/etc/jobs/examples/sles11sp3.yml -%config(noreplace) /opt/kanku/etc/log4perl.conf +%config(noreplace) %{kanku_prefix}/etc/log4perl.conf -%dir /etc/sudoers.d -%config (noreplace) /etc/sudoers.d/kanku +%ghost /etc/sudoers.d/kanku %exclude %dir /etc/profile.d %config /etc/profile.d/kanku.sh @@ -233,65 +235,94 @@ TODO: %exclude %dir /etc/logrotate.d/ %config /etc/logrotate.d/kanku-common -/opt/kanku/lib/Kanku/Handler/ -/opt/kanku/lib/Kanku/Roles/ -/opt/kanku/lib/Kanku/Schema/ -/opt/kanku/lib/Kanku/Setup/ -/opt/kanku/lib/Kanku/Util/ -/opt/kanku/lib/Kanku/Task/ -/opt/kanku/lib/OpenStack/ -/opt/kanku/lib/Kanku/Config.pm -/opt/kanku/lib/Kanku/Handler.pod -/opt/kanku/lib/Kanku/Notifier -/opt/kanku/lib/Kanku/Job.pm -/opt/kanku/lib/Kanku/RabbitMQ.pm -/opt/kanku/lib/Kanku/Schema.pm -/opt/kanku/lib/Kanku/JobList.pm -/opt/kanku/lib/Kanku/Task.pm -/opt/kanku/lib/Kanku/Airbrake.pm -/opt/kanku/lib/Kanku/NotifyQueue.pm +%dir %{kanku_prefix}/lib/Kanku/NotifyQueue/ +%{kanku_prefix}/lib/Kanku/NotifyQueue/*.pm +%{kanku_prefix}/lib/Kanku/Handler/ +%{kanku_prefix}/lib/Kanku/Roles/ +%{kanku_prefix}/lib/Kanku/Schema/ +%{kanku_prefix}/lib/Kanku/Setup/ +%{kanku_prefix}/lib/Kanku/Util/ +%{kanku_prefix}/lib/Kanku/Task/ +%{kanku_prefix}/lib/OpenStack/ +%{kanku_prefix}/lib/Kanku/Config.pm +%{kanku_prefix}/lib/Kanku/Handler.pod +%{kanku_prefix}/lib/Kanku/Notifier +%{kanku_prefix}/lib/Kanku/Job.pm +%{kanku_prefix}/lib/Kanku/RabbitMQ.pm +%{kanku_prefix}/lib/Kanku/Schema.pm +%{kanku_prefix}/lib/Kanku/JobList.pm +%{kanku_prefix}/lib/Kanku/Task.pm +%{kanku_prefix}/lib/Kanku/Airbrake.pm +%{kanku_prefix}/lib/Kanku/NotifyQueue.pm -%dir /opt/kanku/lib/Kanku/WebSocket -/opt/kanku/lib/Kanku/WebSocket/Notification.pm -/opt/kanku/lib/Kanku/WebSocket/Session.pm +%dir %{kanku_prefix}/lib/Kanku/WebSocket +%{kanku_prefix}/lib/Kanku/WebSocket/Notification.pm +%{kanku_prefix}/lib/Kanku/WebSocket/Session.pm -%dir /opt/kanku/lib/Kanku/Airbrake -/opt/kanku/lib/Kanku/Airbrake/Dummy.pm +%dir %{kanku_prefix}/lib/Kanku/Airbrake +%{kanku_prefix}/lib/Kanku/Airbrake/Dummy.pm -%dir /opt/kanku/lib/Kanku/LibVirt -/opt/kanku/lib/Kanku/LibVirt/HostList.pm +%dir %{kanku_prefix}/lib/Kanku/LibVirt +%{kanku_prefix}/lib/Kanku/LibVirt/HostList.pm -%dir /opt/kanku/lib/Kanku/Dispatch/ -/opt/kanku/lib/Kanku/Dispatch/Local.pm +%dir %{kanku_prefix}/lib/Kanku/Dispatch/ +%{kanku_prefix}/lib/Kanku/Dispatch/Local.pm %package cli Summary: Command line client for kanku Requires: kanku-common Requires: libvirt-client +Requires(pre): libvirt-daemon libvirt-daemon-driver-qemu qemu-kvm +Requires(pre): sudo +Requires: perl(Net::AMQP::RabbitMQ) %description cli Command line client for kanku, mainly used for setup tasks and in developer mode %files cli -%dir /opt/kanku/views/cli/ -%dir /opt/kanku/views/cli/rjob -/opt/kanku/views/cli/*.tt -/opt/kanku/views/cli/rjob/*.tt -/opt/kanku/lib/Kanku/Cmd/ -/opt/kanku/lib/Kanku/Cmd.pm +%dir %{kanku_prefix}/views/cli/ +%dir %{kanku_prefix}/views/cli/rjob +%{kanku_prefix}/views/cli/*.tt +%{kanku_prefix}/views/cli/rjob/*.tt +%{kanku_prefix}/lib/Kanku/Cmd/ +%{kanku_prefix}/lib/Kanku/Cmd.pm + +%package common-server +Summary: Common server files or settings for kanku +Requires(pre): libvirt-daemon libvirt-daemon-driver-qemu qemu-kvm +Requires(pre): shadow + +%description common-server +This package contains common server files, settings and dependencies +for the kanku server components like kanku-worker, kanku-dispatcher, +kanku-web, kanku-scheduler and kanku-triggerd + +%pre common-server +getent group %{kanku_group} >/dev/null || groupadd -r %{kanku_group} +getent passwd %{kanku_user} >/dev/null || useradd -r -g %{kanku_group} -G libvirt -d %{kanku_vardir} -s /sbin/nologin -c "user for kanku" %{kanku_user} +exit 0 + +%files common-server +%defattr(-, root, root) +%dir %{kanku_prefix}/var +%dir %attr(755, kankurun, kanku) %{kanku_prefix}/var/log +%dir %attr(755, kankurun, kanku) %{kanku_prefix}/var/cache +%dir %attr(755, kankurun, kanku) %{kanku_prefix}/var/run +%dir %attr(755, kankurun, kanku) %{kanku_prefix}/var/db %package web Summary: WebUI for kanku Requires: kanku-common +Requires: kanku-common-server Requires: perl(Dancer2::Plugin::WebSocket) Requires: perl(Twiggy) Requires: perl(Mail::Message::Body::String) Requires: perl(Mail::Transport::Send) Requires: perl(Net::AMQP::RabbitMQ) Requires: perl(UUID) -#Requires: %{?systemd_requires} +Requires: smtp_daemon %description web TODO: @@ -310,43 +341,44 @@ TODO: %service_del_postun kanku-web.service %files web -%attr(755,root,root) /opt/kanku/bin/kanku-app.psgi -%dir /opt/kanku/views/ +%attr(755,root,root) %{kanku_prefix}/bin/kanku-app.psgi +%dir %attr(755, kankurun, kanku) %{kanku_prefix}/var/sessions +%dir %{kanku_prefix}/views/ %{_unitdir}/kanku-web.service %{_sbindir}/rckanku-web -/opt/kanku/views/admin.tt -/opt/kanku/views/guest.tt -/opt/kanku/views/index.tt -/opt/kanku/views/job.tt -/opt/kanku/views/notify.tt -/opt/kanku/views/notify_disabled.tt -/opt/kanku/views/job_history.tt -/opt/kanku/views/job_result.tt -%dir /opt/kanku/views/layouts -/opt/kanku/views/layouts/main.tt -/opt/kanku/views/login.tt -%dir /opt/kanku/views/login -/opt/kanku/views/login/denied.tt -/opt/kanku/views/admin.tt -/opt/kanku/views/settings.tt -/opt/kanku/views/signup.tt -/opt/kanku/views/pwreset.tt -/opt/kanku/views/reset_password.tt +%{kanku_prefix}/views/admin.tt +%{kanku_prefix}/views/guest.tt +%{kanku_prefix}/views/index.tt +%{kanku_prefix}/views/job.tt +%{kanku_prefix}/views/notify.tt +%{kanku_prefix}/views/notify_disabled.tt +%{kanku_prefix}/views/job_history.tt +%{kanku_prefix}/views/job_result.tt +%dir %{kanku_prefix}/views/layouts +%{kanku_prefix}/views/layouts/main.tt +%{kanku_prefix}/views/login.tt +%dir %{kanku_prefix}/views/login +%{kanku_prefix}/views/login/denied.tt +%{kanku_prefix}/views/admin.tt +%{kanku_prefix}/views/settings.tt +%{kanku_prefix}/views/signup.tt +%{kanku_prefix}/views/pwreset.tt +%{kanku_prefix}/views/reset_password.tt %dir /etc/apache2 %dir /etc/apache2/conf.d -%config (noreplace) /etc/apache2/conf.d/kanku.conf +%ghost %config (noreplace) /etc/apache2/conf.d/kanku.conf # public contains css/js/bootstrap/jquery etc -/opt/kanku/public/ -/opt/kanku/lib/Kanku.pm -/opt/kanku/lib/Kanku/REST.pm +%{kanku_prefix}/public/ +%{kanku_prefix}/lib/Kanku.pm +%{kanku_prefix}/lib/Kanku/REST.pm %package worker Summary: Worker daemon for kanku Requires: kanku-common -#Requires: %{?systemd_requires} +Requires: kanku-common-server Requires: perl(Net::AMQP::RabbitMQ) Requires: perl(UUID) Requires: perl(Sys::CPU) @@ -371,15 +403,16 @@ A simple remote worker for kanku based on RabbitMQ %files worker %{_unitdir}/kanku-worker.service %{_sbindir}/rckanku-worker -/opt/kanku/bin/kanku-worker -/opt/kanku/lib/Kanku/Daemon/Worker.pm +%{kanku_prefix}/bin/kanku-worker +%{kanku_prefix}/lib/Kanku/Daemon/Worker.pm %package dispatcher Summary: Dispatcher daemon for kanku Requires: kanku-common -#Requires: %{?systemd_requires} +Requires: kanku-common-server Requires: perl(Net::AMQP::RabbitMQ) +Requires(pre): sudo Recommends: rabbitmq-server %description dispatcher @@ -400,14 +433,15 @@ A simple dispatcher for kanku based on RabbitMQ %files dispatcher %{_unitdir}/kanku-dispatcher.service %{_sbindir}/rckanku-dispatcher -/opt/kanku/bin/kanku-dispatcher -/opt/kanku/lib/Kanku/Daemon/Dispatcher.pm -/opt/kanku/lib/Kanku/Dispatch/RabbitMQ.pm +%{kanku_prefix}/bin/kanku-dispatcher +%{kanku_prefix}/lib/Kanku/Daemon/Dispatcher.pm +%{kanku_prefix}/lib/Kanku/Dispatch/RabbitMQ.pm +%{kanku_prefix}/views/notifier/ %package scheduler Summary: Scheduler daemon for kanku Requires: kanku-common -#Requires: %{?systemd_requires} +Requires: kanku-common-server %description scheduler A simple scheduler for kanku based on RabbitMQ @@ -425,15 +459,15 @@ A simple scheduler for kanku based on RabbitMQ %service_del_postun kanku-scheduler.service %files scheduler -%attr(755,root,root) /opt/kanku/bin/kanku-scheduler -/opt/kanku/lib/Kanku/Daemon/Scheduler.pm +%attr(755,root,root) %{kanku_prefix}/bin/kanku-scheduler +%{kanku_prefix}/lib/Kanku/Daemon/Scheduler.pm %{_unitdir}/kanku-scheduler.service %{_sbindir}/rckanku-scheduler %package triggerd Summary: Trigger daemon for kanku Requires: kanku-common -#Requires: %{?systemd_requires} +Requires: kanku-common-server %description triggerd A simple triggerd for kanku based on RabbitMQ @@ -451,10 +485,10 @@ A simple triggerd for kanku based on RabbitMQ %service_del_postun kanku-triggerd.service %files triggerd -%attr(755,root,root) /opt/kanku/bin/kanku-triggerd -%dir /opt/kanku/lib/Kanku/Listener -/opt/kanku/lib/Kanku/Daemon/TriggerD.pm -/opt/kanku/lib/Kanku/Listener/RabbitMQ.pm +%attr(755,root,root) %{kanku_prefix}/bin/kanku-triggerd +%dir %{kanku_prefix}/lib/Kanku/Listener +%{kanku_prefix}/lib/Kanku/Daemon/TriggerD.pm +%{kanku_prefix}/lib/Kanku/Listener/RabbitMQ.pm %{_unitdir}/kanku-triggerd.service %{_sbindir}/rckanku-triggerd @@ -468,6 +502,4 @@ This package contains the documentation files for kanku %files doc %{_defaultdocdir}/kanku/ - - %changelog