Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at 2017-03-22 23:18:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-http-server (Old) and /work/SRC/openSUSE:Factory/.yast2-http-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-http-server" Wed Mar 22 23:18:12 2017 rev:78 rq:480651 version:3.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-http-server/yast2-http-server.changes 2016-10-28 10:47:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-http-server.new/yast2-http-server.changes 2017-03-22 23:18:14.280137020 +0100 @@ -1,0 +2,7 @@ +Wed Mar 15 14:27:23 UTC 2017 - [email protected] + +- Create a backup at startup of the vhost configuration files to + be potentially merged during execution (bsc#1027582) +- 3.2.2 + +------------------------------------------------------------------- Old: ---- yast2-http-server-3.2.1.tar.bz2 New: ---- yast2-http-server-3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.5y5Uub/_old 2017-03-22 23:18:14.848056575 +0100 +++ /var/tmp/diff_new_pack.5y5Uub/_new 2017-03-22 23:18:14.848056575 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-http-server # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 3.2.1 +Version: 3.2.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,9 +40,8 @@ Requires: libzio Requires: yast2-network Requires: yast2-perl-bindings -# DnsServerApi moved to yast2.rpm (bnc#392606) -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 3.1.118 +# FileChanges.created_files (bsc#1027582) +Requires: yast2 >= 3.2.16 BuildArch: noarch ++++++ yast2-http-server-3.2.1.tar.bz2 -> yast2-http-server-3.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.2.1/.travis.yml new/yast2-http-server-3.2.2/.travis.yml --- old/yast2-http-server-3.2.1/.travis.yml 2016-10-26 13:22:19.570280391 +0200 +++ new/yast2-http-server-3.2.2/.travis.yml 2017-03-16 15:50:52.392870962 +0100 @@ -1,16 +1,11 @@ -language: cpp -compiler: - - gcc +sudo: required +language: bash +services: + - docker + before_install: - # disable rvm, use system Ruby - - rvm reset - - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh - - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2" -g "yast-rake gettext" + - docker build -t yast-http-server-image . script: - - rake check:syntax - - rake check:pot - - make -f Makefile.cvs - - make - - sudo make install - - make check - + # the "yast-travis-ruby" script is included in the base yastdevel/ruby image + # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby + - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-http-server-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.2.1/Dockerfile new/yast2-http-server-3.2.2/Dockerfile --- old/yast2-http-server-3.2.1/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-http-server-3.2.2/Dockerfile 2017-03-16 15:50:52.440870962 +0100 @@ -0,0 +1,3 @@ +FROM yastdevel/ruby +COPY . /usr/src/app + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.2.1/package/yast2-http-server.changes new/yast2-http-server-3.2.2/package/yast2-http-server.changes --- old/yast2-http-server-3.2.1/package/yast2-http-server.changes 2016-10-26 13:22:19.574280399 +0200 +++ new/yast2-http-server-3.2.2/package/yast2-http-server.changes 2017-03-16 15:50:52.468870962 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 15 14:27:23 UTC 2017 - [email protected] + +- Create a backup at startup of the vhost configuration files to + be potentially merged during execution (bsc#1027582) +- 3.2.2 + +------------------------------------------------------------------- Wed Oct 26 10:56:40 UTC 2016 - [email protected] - Adding mod_socache_shmcb if SSL is enabled. (bsc#854570) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.2.1/package/yast2-http-server.spec new/yast2-http-server-3.2.2/package/yast2-http-server.spec --- old/yast2-http-server-3.2.1/package/yast2-http-server.spec 2016-10-26 13:22:19.574280399 +0200 +++ new/yast2-http-server-3.2.2/package/yast2-http-server.spec 2017-03-16 15:50:52.468870962 +0100 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 3.2.1 +Version: 3.2.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,9 +29,8 @@ BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2 >= 3.1.118 Requires: yast2-network yast2-perl-bindings libzio -# DnsServerApi moved to yast2.rpm (bnc#392606) -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 3.1.118 +# FileChanges.created_files (bsc#1027582) +Requires: yast2 >= 3.2.16 BuildArchitectures: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.2.1/src/modules/HttpServer.rb new/yast2-http-server-3.2.2/src/modules/HttpServer.rb --- old/yast2-http-server-3.2.1/src/modules/HttpServer.rb 2016-10-26 13:22:19.578280394 +0200 +++ new/yast2-http-server-3.2.2/src/modules/HttpServer.rb 2017-03-16 15:50:52.484870962 +0100 @@ -73,6 +73,8 @@ "/etc/apache2/listen.conf", "/etc/apache2/vhosts.d/yast2_vhosts.conf" ] + + @vhost_files_to_backup = [] end IGNORED_FILES = ["vhost.template", "vhost-ssl.template"] @@ -304,6 +306,7 @@ if !FileChanges.CheckNewCreatedFiles(dynamic_files_to_check()) return false end + @vhost_files_to_backup = FileChanges.created_files(dynamic_files_to_check) # check the modules RPMs modules = YaST::HTTPDData.GetModuleList @@ -449,6 +452,7 @@ # write httpd.conf # write hosts + backup_vhost_config YaST::HTTPDData.WriteHosts Progress.NextStage Yast.import "SuSEFirewall" @@ -851,6 +855,19 @@ publish :function => :Export, :type => "map ()" publish :function => :Summary, :type => "list ()" publish :function => :AutoPackages, :type => "map ()" + + private + + def backup_vhost_config + return if @vhost_files_to_backup.empty? + + backup_dir = File.join(APACHE_VHOSTS_DIR, "YaSTsave") + SCR.Execute(path(".target.bash"), "mkdir #{backup_dir}") + + @vhost_files_to_backup.each do |file| + SCR.Execute(path(".target.bash"), "cp -a #{file} #{backup_dir}") + end + end end HttpServer = HttpServerClass.new
