Hello community, here is the log from the commit of package rmt-server for openSUSE:Factory checked in at 2018-05-19 15:43:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rmt-server (Old) and /work/SRC/openSUSE:Factory/.rmt-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rmt-server" Sat May 19 15:43:00 2018 rev:9 rq:610308 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rmt-server/rmt-server.changes 2018-04-27 16:09:18.962304615 +0200 +++ /work/SRC/openSUSE:Factory/.rmt-server.new/rmt-server.changes 2018-05-19 15:43:12.253007695 +0200 @@ -1,0 +2,58 @@ +Fri May 18 08:24:11 UTC 2018 - sko...@suse.com + +- Bump version to 1.0.0 (bsc#1093879) +- Make rmt-server recommend yast2-rmt +- Add the post-install message about running yast2-rmt +- Add new script rmt-data-import for migration from SMT to RMT +- Split off usage instruction into MANUAL.md +- Squash migrations into one +- Small improvements on CLI responses +- Rename clientSetup4RMT.sh => rmt-client-setup +- Add use-ruby-2.5-in-rmt-data-import.patch + +------------------------------------------------------------------- +Fri May 11 15:54:46 UTC 2018 - hschm...@suse.com + +- Don't check if a product has repos and that they are mirrored + when deactivating. + See: https://github.com/SUSE/rmt/pull/168 + +------------------------------------------------------------------- +Wed May 9 09:36:02 UTC 2018 - wstephen...@suse.com + +- Show custom repositories and product bindings in supportconfig + plugin output +- Add CSV output option + See: https://github.com/SUSE/rmt/pull/158 + +------------------------------------------------------------------- +Tue May 8 09:58:29 UTC 2018 - tmunta...@suse.com + +- Rename of service files + rmt.service -> rmt-server.service + rmt-migration.service -> rmt-server-migration.service + See: https://github.com/SUSE/rmt/pull/159 + +------------------------------------------------------------------- +Mon May 7 10:55:19 UTC 2018 - tmunta...@suse.com + +- RMT server binds to 127.0.0.1, not 0.0.0.0 + See: https://github.com/SUSE/rmt/pull/158 +------------------------------------------------------------------- +Mon May 7 10:30:58 UTC 2018 - sko...@suse.com + +- Lockfile handling with File#flock + See: https://github.com/SUSE/rmt/pull/157 + +------------------------------------------------------------------- +Thu May 3 15:27:58 UTC 2018 - sko...@suse.com + +- Added lockfile feature for mirror, sync & import commands + +------------------------------------------------------------------- +Thu May 3 08:50:43 UTC 2018 - tmunta...@suse.com + +- Removed ability to change user/group through configuration (GH-144) + See: https://github.com/SUSE/rmt/pull/154 + +------------------------------------------------------------------- Old: ---- rmt-migration.service rmt-server-0.0.7.tar.bz2 rmt.8.gz rmt.service rmt.target New: ---- rmt-cli.8.gz rmt-server-1.0.0.tar.bz2 rmt-server-migration.service rmt-server.service rmt-server.target use-ruby-2.5-in-rmt-data-import.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rmt-server.spec ++++++ --- /var/tmp/diff_new_pack.UJ05FX/_old 2018-05-19 15:43:13.528961012 +0200 +++ /var/tmp/diff_new_pack.UJ05FX/_new 2018-05-19 15:43:13.528961012 +0200 @@ -16,45 +16,39 @@ # -%if 0%{?suse_version} == 1315 -%define is_sle_12_family 1 -%endif - -%define app_dir /usr/share/rmt/ +%define app_dir %{_datadir}/rmt/ %define lib_dir %{_libdir}/rmt/ -%define data_dir /var/lib/rmt/ +%define data_dir %{_localstatedir}/lib/rmt/ %define rmt_user _rmt %define rmt_group nginx - +%if 0%{?suse_version} == 1315 +%define is_sle_12_family 1 +%endif Name: rmt-server -Version: 0.0.7 +Version: 1.0.0 Release: 0 Summary: Repository mirroring tool and registration proxy for SCC License: GPL-2.0-or-later Group: Productivity/Networking/Web/Proxy -Url: https://software.opensuse.org/package/rmt -# Does not build for i586 and s390 and is not supported on those architectures -ExcludeArch: %ix86 s390 - +Url: https://software.opensuse.org/package/rmt-server Source0: %{name}-%{version}.tar.bz2 Source1: rmt-server-rpmlintrc Source2: rmt.conf -Source3: rmt.8.gz +Source3: rmt-cli.8.gz Source4: nginx-http.conf Source5: rmt-server-mirror.service Source6: rmt-server-mirror.timer Source7: rmt-server-sync.service Source8: rmt-server-sync.timer -Source9: rmt.service -Source10: rmt.target -Source11: rmt-migration.service +Source9: rmt-server.service +Source10: rmt-server.target +Source11: rmt-server-migration.service Source12: rmt-server-sync-sles12.timer Source13: rmt-server-mirror-sles12.timer Source14: nginx-https.conf - Patch0: use-ruby-2.5-in-rmt-cli.patch Patch1: use-ruby-2.5-in-rails.patch - +Patch2: use-ruby-2.5-in-rmt-data-import.patch BuildRequires: fdupes BuildRequires: gcc BuildRequires: libcurl-devel @@ -66,14 +60,16 @@ BuildRequires: ruby2.5-devel BuildRequires: ruby2.5-rubygem-bundler BuildRequires: systemd - Requires: mariadb Requires: nginx Requires(post): ruby2.5 Requires(post): ruby2.5-rubygem-bundler +Requires(post): shadow Requires(post): timezone Requires(post): util-linux -Requires(post): shadow +Recommends: yast2-rmt +# Does not build for i586 and s390 and is not supported on those architectures +ExcludeArch: %{ix86} s390 %description This package provides a mirroring tool for RPM repositories and a registration @@ -89,15 +85,16 @@ RMT supersedes the main functionality of SMT in SLES 15. %prep -cp -p %SOURCE2 . +cp -p %{SOURCE2} . %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build -bundle.ruby2.5 install %{?jobs:--jobs %jobs} --without test development --deployment --standalone +bundle.ruby2.5 install %{?jobs:--jobs %{jobs}} --without test development --deployment --standalone %install mkdir -p %{buildroot}%{data_dir} @@ -115,7 +112,8 @@ ln -s %{data_dir}/public/repo %{buildroot}%{app_dir}/public/repo mkdir -p %{buildroot}%{_bindir} ln -s %{app_dir}/bin/rmt-cli %{buildroot}%{_bindir} -install -D -m 644 %_sourcedir/rmt.8.gz %{buildroot}%_mandir/man8/rmt.8.gz +ln -s %{app_dir}/bin/rmt-data-import %{buildroot}%{_bindir}/rmt-data-import +install -D -m 644 %{_sourcedir}/rmt-cli.8.gz %{buildroot}%{_mandir}/man8/rmt-cli.8.gz # systemd mkdir -p %{buildroot}%{_unitdir} @@ -134,8 +132,8 @@ install -m 444 %{SOURCE10} %{buildroot}%{_unitdir} install -m 444 %{SOURCE11} %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_sbindir} -ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rcrmt -ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rcrmt-migration +ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rcrmt-server +ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rcrmt-server-migration ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rcrmt-server-mirror ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rcrmt-server-sync @@ -183,7 +181,6 @@ %fdupes %{buildroot}/%{lib_dir} %files -%defattr(-,root,root) %attr(-,%{rmt_user},%{rmt_group}) %{app_dir} %attr(-,%{rmt_user},%{rmt_group}) %{data_dir} %dir %{_libexecdir}/supportconfig @@ -193,15 +190,16 @@ %config(noreplace) %{_sysconfdir}/rmt.conf %config(noreplace) %{_sysconfdir}/nginx/vhosts.d/rmt-server-http.conf %config(noreplace) %{_sysconfdir}/nginx/vhosts.d/rmt-server-https.conf -%doc %{_mandir}/man8/rmt.8.gz +%{_mandir}/man8/rmt-cli.8%{?ext_man} %{_bindir}/rmt-cli -%{_sbindir}/rcrmt -%{_sbindir}/rcrmt-migration +%{_bindir}/rmt-data-import +%{_sbindir}/rcrmt-server +%{_sbindir}/rcrmt-server-migration %{_sbindir}/rcrmt-server-sync %{_sbindir}/rcrmt-server-mirror -%{_unitdir}/rmt.target -%{_unitdir}/rmt.service -%{_unitdir}/rmt-migration.service +%{_unitdir}/rmt-server.target +%{_unitdir}/rmt-server.service +%{_unitdir}/rmt-server-migration.service %{_unitdir}/rmt-server-mirror.service %{_unitdir}/rmt-server-mirror.timer %{_unitdir}/rmt-server-sync.service @@ -215,17 +213,18 @@ getent passwd %{rmt_user} >/dev/null || \ %{_sbindir}/useradd -g %{rmt_group} -s /bin/false -r \ -c "user for RMT" -d %{app_dir} %{rmt_user} -%service_add_pre rmt.target rmt.service rmt-migration.service rmt-server-mirror.service rmt-server-sync.service +%service_add_pre rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service %post -%service_add_post rmt.target rmt.service rmt-migration.service rmt-server-mirror.service rmt-server-sync.service -cd /usr/share/rmt && runuser -u %{rmt_user} -g %{rmt_group} -- bin/rails secrets:setup >/dev/null -cd /usr/share/rmt && runuser -u %{rmt_user} -g %{rmt_group} -- bin/rails runner -e production "Rails::Secrets.write({'production' => {'secret_key_base' => SecureRandom.hex(64)}}.to_yaml)" +%service_add_post rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service +cd %{_datadir}/rmt && runuser -u %{rmt_user} -g %{rmt_group} -- bin/rails secrets:setup >/dev/null +cd %{_datadir}/rmt && runuser -u %{rmt_user} -g %{rmt_group} -- bin/rails runner -e production "Rails::Secrets.write({'production' => {'secret_key_base' => SecureRandom.hex(64)}}.to_yaml)" >/dev/null +echo "Please run the YaST RMT module (or 'yast2 rmt' from the command line) to complete the configuration of your RMT" >> /dev/stdout %preun -%service_del_preun rmt.target rmt.service rmt-migration.service rmt-server-mirror.service rmt-server-sync.service +%service_del_preun rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service %postun -%service_del_postun rmt.target rmt.service rmt-migration.service rmt-server-mirror.service rmt-server-sync.service +%service_del_postun rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service %changelog ++++++ rmt-server-0.0.7.tar.bz2 -> rmt-server-1.0.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/rmt-server/rmt-server-0.0.7.tar.bz2 /work/SRC/openSUSE:Factory/.rmt-server.new/rmt-server-1.0.0.tar.bz2 differ: char 11, line 1 ++++++ rmt-server-migration.service ++++++ [Unit] Description=RMT database setup Requires=mysql.service After=mysql.service Before=rmt-server.service [Service] Type=oneshot User=_rmt Environment=LOG_TO_JOURNALD=1 WorkingDirectory=/usr/share/rmt ExecStart=/usr/share/rmt/bin/rails db:create db:migrate RAILS_ENV=production [Install] WantedBy=rmt-server.target ++++++ rmt-server-mirror-sles12.timer ++++++ --- /var/tmp/diff_new_pack.UJ05FX/_old 2018-05-19 15:43:13.648956621 +0200 +++ /var/tmp/diff_new_pack.UJ05FX/_new 2018-05-19 15:43:13.648956621 +0200 @@ -1,7 +1,7 @@ [Unit] Description=RMT Mirror timer -After=rmt.service -Requires=rmt.service +After=rmt-server.service +Requires=rmt-server.service [Timer] OnCalendar=*-*-* 02:00:00 ++++++ rmt-server-mirror.service ++++++ --- /var/tmp/diff_new_pack.UJ05FX/_old 2018-05-19 15:43:13.672955743 +0200 +++ /var/tmp/diff_new_pack.UJ05FX/_new 2018-05-19 15:43:13.672955743 +0200 @@ -1,7 +1,7 @@ [Unit] Description=Mirror RMT -After=rmt.service -Requires=rmt.service +After=rmt-server.service +Requires=rmt-server.service [Service] Type=simple ++++++ rmt-server-mirror.timer ++++++ --- /var/tmp/diff_new_pack.UJ05FX/_old 2018-05-19 15:43:13.700954719 +0200 +++ /var/tmp/diff_new_pack.UJ05FX/_new 2018-05-19 15:43:13.700954719 +0200 @@ -1,7 +1,7 @@ [Unit] Description=RMT Mirror timer -After=rmt.service -Requires=rmt.service +After=rmt-server.service +Requires=rmt-server.service [Timer] OnCalendar=*-*-* 02:00:00 ++++++ rmt-server-sync-sles12.timer ++++++ --- /var/tmp/diff_new_pack.UJ05FX/_old 2018-05-19 15:43:13.736953401 +0200 +++ /var/tmp/diff_new_pack.UJ05FX/_new 2018-05-19 15:43:13.740953256 +0200 @@ -1,7 +1,7 @@ [Unit] Description=RMT Sync timer -After=rmt.service -Requires=rmt.service +After=rmt-server.service +Requires=rmt-server.service [Timer] OnCalendar=*-*-* 01:00:00 ++++++ rmt-server-sync.service ++++++ --- /var/tmp/diff_new_pack.UJ05FX/_old 2018-05-19 15:43:13.764952377 +0200 +++ /var/tmp/diff_new_pack.UJ05FX/_new 2018-05-19 15:43:13.764952377 +0200 @@ -1,7 +1,7 @@ [Unit] Description=Sync RMT from scc -After=rmt.service -Requires=rmt.service +After=rmt-server.service +Requires=rmt-server.service [Service] Type=simple ++++++ rmt-server-sync.timer ++++++ --- /var/tmp/diff_new_pack.UJ05FX/_old 2018-05-19 15:43:13.788951500 +0200 +++ /var/tmp/diff_new_pack.UJ05FX/_new 2018-05-19 15:43:13.788951500 +0200 @@ -1,7 +1,7 @@ [Unit] Description=RMT Sync timer -After=rmt.service -Requires=rmt.service +After=rmt-server.service +Requires=rmt-server.service [Timer] OnCalendar=*-*-* 01:00:00 ++++++ rmt-server.service ++++++ [Unit] Description=RMT API server Requires=mysql.service Requires=rmt-server-migration.service Requires=nginx.service After=rmt-server-migration.service [Service] Type=simple User=_rmt PrivateTmp=yes Environment=LOG_TO_JOURNALD=1 WorkingDirectory=/usr/share/rmt ExecStart=/usr/share/rmt/bin/rails server -e production -b 127.0.0.1 Restart=always [Install] WantedBy=multi-user.target ++++++ rmt-server.target ++++++ [Unit] Description=Repository Mirroring Tool Requires=mysql.service Requires=rmt-server-migration.service Requires=rmt-server.service [Install] WantedBy=multi-user.target ++++++ rmt.conf ++++++ --- /var/tmp/diff_new_pack.UJ05FX/_old 2018-05-19 15:43:13.856949011 +0200 +++ /var/tmp/diff_new_pack.UJ05FX/_new 2018-05-19 15:43:13.856949011 +0200 @@ -17,13 +17,6 @@ verify_rpm_checksums: false dedup_method: hardlink -rails: - port: 4224 - -cli: - user: _rmt - group: nginx - http_client: verbose: false proxy: ++++++ use-ruby-2.5-in-rmt-data-import.patch ++++++ diff --git a/bin/rmt-data-import b/bin/rmt-data-import index f232051..8b4330a 100755 --- a/bin/rmt-data-import +++ b/bin/rmt-data-import @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/ruby.ruby2.5 # Allow different path variables for development and production RMT_PATH = ENV['RMT_PATH'] ? ENV['RMT_PATH'] : '/usr/share/rmt/'
