Hello community, here is the log from the commit of package rmt-server for openSUSE:Factory checked in at 2018-08-31 10:44:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rmt-server (Old) and /work/SRC/openSUSE:Factory/.rmt-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rmt-server" Fri Aug 31 10:44:00 2018 rev:13 rq:631740 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/rmt-server/rmt-server.changes 2018-07-27 10:58:14.753876642 +0200 +++ /work/SRC/openSUSE:Factory/.rmt-server.new/rmt-server.changes 2018-08-31 10:44:31.807208686 +0200 @@ -1,0 +2,8 @@ +Thu Aug 2 16:19:35 UTC 2018 - [email protected] + +- Version 1.0.6 +- Change file paths to new locations to make RMT work with + read-only rootfs (bsc#1102198) +- Change file permissions for rmt.conf (bsc#1104232) + +------------------------------------------------------------------- @@ -4,0 +13 @@ +- sort all list outputs alphabetically (bsc#1088680) Old: ---- rmt-server-1.0.5.tar.bz2 New: ---- rmt-server-1.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rmt-server.spec ++++++ --- /var/tmp/diff_new_pack.UA0Uqg/_old 2018-08-31 10:44:32.547209572 +0200 +++ /var/tmp/diff_new_pack.UA0Uqg/_new 2018-08-31 10:44:32.551209577 +0200 @@ -19,18 +19,19 @@ %define app_dir %{_datadir}/rmt/ %define lib_dir %{_libdir}/rmt/ %define data_dir %{_localstatedir}/lib/rmt/ +%define conf_dir %{_sysconfdir}/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: 1.0.5 +Version: 1.0.6 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-server +Url: https://software.opensuse.org/package/rmt-server Source0: %{name}-%{version}.tar.bz2 Source1: rmt-server-rpmlintrc Source2: rmt.conf @@ -67,7 +68,8 @@ Requires(post): shadow Requires(post): timezone Requires(post): util-linux -Recommends: yast2-rmt +Conflicts: yast2-rmt < 1.0.3 +Recommends: yast2-rmt >= 1.0.3 # Does not build for i586 and s390 and is not supported on those architectures ExcludeArch: %{ix86} s390 @@ -100,12 +102,14 @@ mkdir -p %{buildroot}%{data_dir} mkdir -p %{buildroot}%{lib_dir} mkdir -p %{buildroot}%{app_dir} +mkdir -p %{buildroot}%{conf_dir} +mkdir -p %{buildroot}/var/lib/rmt mv tmp %{buildroot}%{data_dir} mkdir %{buildroot}%{data_dir}/public mv public/repo %{buildroot}%{data_dir}/public/ mv vendor %{buildroot}%{lib_dir} -mv ssl %{buildroot}%{app_dir} +mv ssl %{buildroot}%{conf_dir} cp -ar . %{buildroot}%{app_dir} ln -s %{data_dir}/tmp %{buildroot}%{app_dir}/tmp @@ -183,11 +187,14 @@ %files %attr(-,%{rmt_user},%{rmt_group}) %{app_dir} %attr(-,%{rmt_user},%{rmt_group}) %{data_dir} +%attr(-,%{rmt_user},%{rmt_group}) %{conf_dir} +%attr(-,%{rmt_user},%{rmt_group}) /var/lib/rmt %dir %{_libexecdir}/supportconfig %dir %{_libexecdir}/supportconfig/plugins %dir %{_sysconfdir}/nginx %dir %{_sysconfdir}/nginx/vhosts.d -%config(noreplace) %{_sysconfdir}/rmt.conf +%dir /var/lib/rmt +%config(noreplace) %attr(0640, %{rmt_user},root) %{_sysconfdir}/rmt.conf %config(noreplace) %{_sysconfdir}/nginx/vhosts.d/rmt-server-http.conf %config(noreplace) %{_sysconfdir}/nginx/vhosts.d/rmt-server-https.conf %{_mandir}/man8/rmt-cli.8%{?ext_man} @@ -219,10 +226,23 @@ %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 -if [ $1 -eq 1 ] ; then + +# Run only on install +if [ $1 -eq 1 ]; then echo "Please run the YaST RMT module (or 'yast2 rmt' from the command line) to complete the configuration of your RMT" >> /dev/stdout fi +# Run only on upgrade +if [ $1 -eq 2 ]; then + if [ -d %{app_dir}/ssl ]; then + mv %{app_dir}/ssl/* %{conf_dir}/ssl + echo "RMT ssl configuration has been moved to a new place. New place is: %{conf_dir}/ssl" + fi + if [ -f %{app_dir}/config/system_uuid ]; then + mv %{app_dir}/config/system_uuid /var/lib/rmt/system_uuid + fi +fi + %preun %service_del_preun rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service ++++++ nginx-https.conf ++++++ --- /var/tmp/diff_new_pack.UA0Uqg/_old 2018-08-31 10:44:32.587209621 +0200 +++ /var/tmp/diff_new_pack.UA0Uqg/_new 2018-08-31 10:44:32.587209621 +0200 @@ -10,8 +10,8 @@ error_log /var/log/nginx/rmt_https_error.log; root /usr/share/rmt/public; - ssl_certificate /usr/share/rmt/ssl/rmt-server.crt; - ssl_certificate_key /usr/share/rmt/ssl/rmt-server.key; + ssl_certificate /etc/rmt/ssl/rmt-server.crt; + ssl_certificate_key /etc/rmt/ssl/rmt-server.key; ssl_protocols TLSv1.2 TLSv1.3; location / { @@ -37,6 +37,6 @@ # An alias to RMT CA certificate, so that it can be downloaded to client machines. location /rmt.crt { - alias /usr/share/rmt/ssl/rmt-ca.crt; + alias /etc/rmt/ssl/rmt-ca.crt; } } ++++++ rmt-cli.8.gz ++++++ --- /var/tmp/diff_new_pack.UA0Uqg/_old 2018-08-31 10:44:32.603209640 +0200 +++ /var/tmp/diff_new_pack.UA0Uqg/_new 2018-08-31 10:44:32.607209644 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "RMT\-CLI" "8" "May 2018" "" "RMT" +.TH "RMT\-CLI" "8" "August 2018" "" "RMT" . .SH "NAME" \fBrmt\-cli\fR \- control and configure your RMT server @@ -159,10 +159,10 @@ By default access to API endpoints consumed by \fBSUSEConnect\fR is limited to HTTPS only\. nginx is configured to use SSL certificate and private key from the following locations: . .IP "\(bu" 4 -Certificate: \fB/usr/share/rmt/ssl/rmt\-server\.crt\fR +Certificate: \fB/etc/rmt/ssl/rmt\-server\.crt\fR . .IP "\(bu" 4 -Private key: \fB/usr/share/rmt/ssl/rmt\-server\.key\fR +Private key: \fB/etc/rmt/ssl/rmt\-server\.key\fR . .IP "" 0 . ++++++ rmt-server-1.0.5.tar.bz2 -> rmt-server-1.0.6.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/rmt-server/rmt-server-1.0.5.tar.bz2 /work/SRC/openSUSE:Factory/.rmt-server.new/rmt-server-1.0.6.tar.bz2 differ: char 11, line 1
