From c7d7b6fb6c55213fcdb59bed9e7e8f46e4397c752c76771dd815ca43d2385f53 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Tue, 17 Jul 2018 22:02:33 +0000 Subject: [PATCH] - Update to version 0.5.2.git20180717.ecec23a: * [dist] tmpfiles.d/kanku -> tmpfiles.d/kanku.conf * [dist] updated README.md * [web] enhanced user settings page (with VUE.js) * [dist] fixed indent in Makefile * [cli] fixed 'setup --standalone' * [web] fix rendering problem in admin interface * [core] better logging * [cli] bugfixes for startvm/stopvm after path refactoring * [web] prefix domain name if role only User - delete button for user prefixed domains * [core] refactor to LFS compliant path structure OBS-URL: https://build.opensuse.org/package/show/devel:kanku/kanku?expand=0&rev=5 --- _servicedata | 2 +- kanku.changes | 15 ++++ kanku.obsinfo | 6 +- kanku.spec | 232 ++++++++++++++++++++++++++------------------------ 4 files changed, 142 insertions(+), 113 deletions(-) diff --git a/_servicedata b/_servicedata index 72609be..cd72ef8 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/M0ses/kanku.git - 0a1a38e823e05b2d850b4cf87c0a1264b54a323a + ecec23af66f0c2f407fbee3fe253d80178d86bfc /home/frank/prj/kanku 07fc15f0647a92f01b67085d698485d3432a8924 \ No newline at end of file diff --git a/kanku.changes b/kanku.changes index 55e32a6..f0d98b5 100644 --- a/kanku.changes +++ b/kanku.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Jul 17 22:02:10 UTC 2018 - opensuse-packaging@opensuse.org + +- Update to version 0.5.2.git20180717.ecec23a: + * [dist] tmpfiles.d/kanku -> tmpfiles.d/kanku.conf + * [dist] updated README.md + * [web] enhanced user settings page (with VUE.js) + * [dist] fixed indent in Makefile + * [cli] fixed 'setup --standalone' + * [web] fix rendering problem in admin interface + * [core] better logging + * [cli] bugfixes for startvm/stopvm after path refactoring + * [web] prefix domain name if role only User - delete button for user prefixed domains + * [core] refactor to LFS compliant path structure + ------------------------------------------------------------------- Thu Jun 21 11:31:29 UTC 2018 - opensuse-packaging@opensuse.org diff --git a/kanku.obsinfo b/kanku.obsinfo index 0fafbae..1f343fc 100644 --- a/kanku.obsinfo +++ b/kanku.obsinfo @@ -1,5 +1,5 @@ name: kanku -version: 0.4.1.git20180612.0a1a38e -mtime: 1528758299 -commit: 0a1a38e823e05b2d850b4cf87c0a1264b54a323a +version: 0.5.2.git20180717.ecec23a +mtime: 1531818989 +commit: ecec23af66f0c2f407fbee3fe253d80178d86bfc diff --git a/kanku.spec b/kanku.spec index 5ce6065..567579e 100644 --- a/kanku.spec +++ b/kanku.spec @@ -16,8 +16,7 @@ # %define kanku_user kankurun %define kanku_group kanku -%define kanku_prefix /opt/kanku -%define kanku_vardir %{kanku_prefix}/var +%define kanku_vardir /var/lib/kanku/ Name: kanku # Version gets set by obs-service-tar_scm @@ -87,6 +86,7 @@ BuildRequires: perl(Dancer2::Plugin::WebSocket) BuildRequires: perl(Dancer2::Plugin::Auth::Extensible) BuildRequires: perl(Net::AMQP::RabbitMQ) BuildRequires: perl(UUID) +BuildRequires: libvirt-daemon BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -98,8 +98,11 @@ Requires: kanku-dispatcher Requires: kanku-triggerd %description -TODO: add some meaningful description - to be more verbose +kanku is designed to give you a better integration of your kiwi images built +by the Open Build Service (OBS) in your development and testing workflow. + +It provides a framework for simple automation of complex setups, +e.g. to prepare your development environment or run simple tests. %prep %setup -q @@ -186,49 +189,57 @@ Conflicts: perl-DBD-SQLite-Amalgamation TODO: add a useful description +%post common +%tmpfiles_create %_tmpfilesdir/kanku.conf %files common %defattr(-,root,root) %doc README.md TODO -%dir %{kanku_prefix} -%dir %{kanku_prefix}/lib -%dir %{kanku_prefix}/lib/Kanku -%dir %{kanku_prefix}/lib/Kanku/Daemon +%dir /usr/lib/kanku +%dir /usr/lib/kanku/lib +%dir /usr/lib/kanku/lib/Kanku +%dir /usr/lib/kanku/lib/Kanku/Daemon # share contains database related stuff -%dir %{kanku_prefix}/share/ -%{kanku_prefix}/share/fixtures -%{kanku_prefix}/share/migrations +%dir /usr/share/kanku +/usr/share/kanku/fixtures +/usr/share/kanku/migrations -%dir %{kanku_prefix}/bin -%attr(755,root,root) %{kanku_prefix}/bin/kanku -%attr(755,root,root) %{kanku_prefix}/bin/kanku-network-setup.pl +%attr(755,root,root) /usr/bin/kanku +%attr(755,root,root) /usr/lib/kanku/network-setup.pl -%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 /etc/kanku +%ghost /etc/kanku/config.yml +%dir /etc/kanku/logging/ +%config(noreplace) /etc/kanku/logging/console.conf +%config(noreplace) /etc/kanku/logging/network-setup.conf +%config(noreplace) /etc/kanku/logging/default.conf -%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 /etc/kanku/templates +%dir /etc/kanku/templates/examples-vm/ +%dir /etc/kanku/templates/cmd +%dir /etc/kanku/templates/cmd/setup +%config /etc/kanku/templates/cmd/init.tt2 +%config /etc/kanku/templates/cmd/setup/* +%config /etc/kanku/templates/examples-vm/obs-server-26.tt2 +%config /etc/kanku/templates/examples-vm/sles11sp3.tt2 +%config /etc/kanku/templates/examples-vm/obs-server.tt2 -%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 +%dir /etc/kanku/jobs +%dir /etc/kanku/jobs/examples +%config /etc/kanku/jobs/examples/obs-server.yml +%config /etc/kanku/jobs/examples/obs-server-26.yml +%config /etc/kanku/jobs/examples/sles11sp3.yml -%config(noreplace) %{kanku_prefix}/etc/log4perl.conf +# %exclude %dir /etc/sudoers.d +# %ghost /etc/sudoers.d/kanku -%ghost /etc/sudoers.d/kanku +%exclude %dir /usr +%exclude %dir /usr/bin/ +%exclude %dir /usr/sbin/ +%exclude %dir /usr/share/ +%exclude %dir /usr/lib/ %exclude %dir /etc/profile.d %config /etc/profile.d/kanku.sh @@ -236,38 +247,41 @@ TODO: %exclude %dir /etc/logrotate.d/ %config /etc/logrotate.d/kanku-common -%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 +%exclude %dir %_tmpfilesdir +%_tmpfilesdir/kanku.conf -%dir %{kanku_prefix}/lib/Kanku/WebSocket -%{kanku_prefix}/lib/Kanku/WebSocket/Notification.pm -%{kanku_prefix}/lib/Kanku/WebSocket/Session.pm +%dir /usr/lib/kanku/lib/Kanku/NotifyQueue/ +/usr/lib/kanku/lib/Kanku/NotifyQueue/*.pm +/usr/lib/kanku/lib/Kanku/Handler/ +/usr/lib/kanku/lib/Kanku/Roles/ +/usr/lib/kanku/lib/Kanku/Schema/ +/usr/lib/kanku/lib/Kanku/Setup/ +/usr/lib/kanku/lib/Kanku/Util/ +/usr/lib/kanku/lib/Kanku/Task/ +/usr/lib/kanku/lib/OpenStack/ +/usr/lib/kanku/lib/Kanku/Config.pm +/usr/lib/kanku/lib/Kanku/Handler.pod +/usr/lib/kanku/lib/Kanku/Notifier +/usr/lib/kanku/lib/Kanku/Job.pm +/usr/lib/kanku/lib/Kanku/RabbitMQ.pm +/usr/lib/kanku/lib/Kanku/Schema.pm +/usr/lib/kanku/lib/Kanku/JobList.pm +/usr/lib/kanku/lib/Kanku/Task.pm +/usr/lib/kanku/lib/Kanku/Airbrake.pm +/usr/lib/kanku/lib/Kanku/NotifyQueue.pm -%dir %{kanku_prefix}/lib/Kanku/Airbrake -%{kanku_prefix}/lib/Kanku/Airbrake/Dummy.pm +%dir /usr/lib/kanku/lib/Kanku/WebSocket +/usr/lib/kanku/lib/Kanku/WebSocket/Notification.pm +/usr/lib/kanku/lib/Kanku/WebSocket/Session.pm -%dir %{kanku_prefix}/lib/Kanku/LibVirt -%{kanku_prefix}/lib/Kanku/LibVirt/HostList.pm +%dir /usr/lib/kanku/lib/Kanku/Airbrake +/usr/lib/kanku/lib/Kanku/Airbrake/Dummy.pm -%dir %{kanku_prefix}/lib/Kanku/Dispatch/ -%{kanku_prefix}/lib/Kanku/Dispatch/Local.pm +%dir /usr/lib/kanku/lib/Kanku/LibVirt +/usr/lib/kanku/lib/Kanku/LibVirt/HostList.pm + +%dir /usr/lib/kanku/lib/Kanku/Dispatch/ +/usr/lib/kanku/lib/Kanku/Dispatch/Local.pm %package cli @@ -283,12 +297,12 @@ Command line client for kanku, mainly used for setup tasks and in developer mode %files cli -%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 +%dir /usr/share/kanku/views/cli/ +%dir /usr/share/kanku/views/cli/rjob +/usr/share/kanku/views/cli/*.tt +/usr/share/kanku/views/cli/rjob/*.tt +/usr/lib/kanku/lib/Kanku/Cmd/ +/usr/lib/kanku/lib/Kanku/Cmd.pm %package common-server Summary: Common server files or settings for kanku @@ -307,11 +321,10 @@ 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 +%dir %attr(755, kankurun, kanku) /var/log/kanku +%dir %attr(755, kankurun, kanku) /var/lib/kanku +%dir %attr(755, kankurun, kanku) /var/cache/kanku +%ghost %dir %attr(755, kankurun, kanku) /run/kanku %package web Summary: WebUI for kanku @@ -322,6 +335,7 @@ Requires: perl(Twiggy) Requires: perl(Mail::Message::Body::String) Requires: perl(Mail::Transport::Send) Requires: perl(Net::AMQP::RabbitMQ) +Requires: perl(Template::Plugin::JSON::Escape) Requires: perl(UUID) Requires: smtp_daemon @@ -342,38 +356,38 @@ TODO: %service_del_postun kanku-web.service %files web -%attr(755,root,root) %{kanku_prefix}/bin/kanku-app.psgi -%dir %attr(755, kankurun, kanku) %{kanku_prefix}/var/sessions -%dir %{kanku_prefix}/views/ +%attr(755,root,root) /usr/lib/kanku/kanku-app.psgi +%dir %attr(755, kankurun, kanku) /var/lib/kanku/sessions +%dir /usr/share/kanku/views/ %{_unitdir}/kanku-web.service %{_sbindir}/rckanku-web -%{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 +/usr/share/kanku/views/admin.tt +/usr/share/kanku/views/guest.tt +/usr/share/kanku/views/index.tt +/usr/share/kanku/views/job.tt +/usr/share/kanku/views/notify.tt +/usr/share/kanku/views/notify_disabled.tt +/usr/share/kanku/views/job_history.tt +/usr/share/kanku/views/job_result.tt +%dir /usr/share/kanku/views/layouts +/usr/share/kanku/views/layouts/main.tt +/usr/share/kanku/views/login.tt +%dir /usr/share/kanku/views/login +/usr/share/kanku/views/login/denied.tt +/usr/share/kanku/views/admin.tt +/usr/share/kanku/views/settings.tt +/usr/share/kanku/views/signup.tt +/usr/share/kanku/views/pwreset.tt +/usr/share/kanku/views/reset_password.tt %dir /etc/apache2 %dir /etc/apache2/conf.d %ghost %config (noreplace) /etc/apache2/conf.d/kanku.conf # public contains css/js/bootstrap/jquery etc -%{kanku_prefix}/public/ -%{kanku_prefix}/lib/Kanku.pm -%{kanku_prefix}/lib/Kanku/REST.pm +/usr/share/kanku/public/ +/usr/lib/kanku/lib/Kanku.pm +/usr/lib/kanku/lib/Kanku/REST.pm %package worker Summary: Worker daemon for kanku @@ -404,8 +418,8 @@ A simple remote worker for kanku based on RabbitMQ %files worker %{_unitdir}/kanku-worker.service %{_sbindir}/rckanku-worker -%{kanku_prefix}/bin/kanku-worker -%{kanku_prefix}/lib/Kanku/Daemon/Worker.pm +%{_sbindir}/kanku-worker +/usr/lib/kanku/lib/Kanku/Daemon/Worker.pm %package dispatcher Summary: Dispatcher daemon for kanku @@ -434,10 +448,10 @@ A simple dispatcher for kanku based on RabbitMQ %files dispatcher %{_unitdir}/kanku-dispatcher.service %{_sbindir}/rckanku-dispatcher -%{kanku_prefix}/bin/kanku-dispatcher -%{kanku_prefix}/lib/Kanku/Daemon/Dispatcher.pm -%{kanku_prefix}/lib/Kanku/Dispatch/RabbitMQ.pm -%{kanku_prefix}/views/notifier/ +%{_sbindir}/kanku-dispatcher +/usr/lib/kanku/lib/Kanku/Daemon/Dispatcher.pm +/usr/lib/kanku/lib/Kanku/Dispatch/RabbitMQ.pm +/usr/share/kanku/views/notifier/ %package scheduler Summary: Scheduler daemon for kanku @@ -460,8 +474,8 @@ A simple scheduler for kanku based on RabbitMQ %service_del_postun kanku-scheduler.service %files scheduler -%attr(755,root,root) %{kanku_prefix}/bin/kanku-scheduler -%{kanku_prefix}/lib/Kanku/Daemon/Scheduler.pm +%attr(755,root,root) %{_sbindir}/kanku-scheduler +/usr/lib/kanku/lib/Kanku/Daemon/Scheduler.pm %{_unitdir}/kanku-scheduler.service %{_sbindir}/rckanku-scheduler @@ -486,12 +500,12 @@ A simple triggerd for kanku based on RabbitMQ %service_del_postun kanku-triggerd.service %files triggerd -%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 +%attr(755,root,root) %{_sbindir}/kanku-triggerd %{_unitdir}/kanku-triggerd.service %{_sbindir}/rckanku-triggerd +%dir /usr/lib/kanku/lib/Kanku/Listener +/usr/lib/kanku/lib/Kanku/Daemon/TriggerD.pm +/usr/lib/kanku/lib/Kanku/Listener/RabbitMQ.pm %package doc