Hello community, here is the log from the commit of package webyast-base for openSUSE:Factory checked in at 2012-10-16 12:12:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webyast-base (Old) and /work/SRC/openSUSE:Factory/.webyast-base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webyast-base", Maintainer is "r...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/webyast-base/webyast-base.changes 2012-08-04 13:39:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.webyast-base.new/webyast-base.changes 2012-10-16 12:12:03.000000000 +0200 @@ -1,0 +2,164 @@ +Fri Oct 12 15:36:01 UTC 2012 - lsle...@suse.cz + +- 0.3.27 + +------------------------------------------------------------------- +Wed Oct 10 08:54:38 UTC 2012 - lsle...@suse.cz + +- write all webyast logs to /var/log/webyast directory instead of + /srv/www/webyast/log (bnc#784012) + +------------------------------------------------------------------- +Thu Oct 4 07:45:44 UTC 2012 - lsle...@suse.cz + +- removed DelayedJob dependency +- decrease default patch status reload timeout to 1 hour (login + session times out after 2 hours, longer time does not make sense) +- 0.3.26 + +------------------------------------------------------------------- +Wed Oct 3 14:43:03 UTC 2012 - lsle...@suse.cz + +- added support for ActiveResource login needed by Studio + (bnc#783355) +- 0.3.25 + +------------------------------------------------------------------- +Tue Sep 25 07:20:24 UTC 2012 - lsle...@suse.cz + +- improved expiration of authentication tokens (implemented + directly in model to avoid problems with background job) + (bnc#779482) + +------------------------------------------------------------------- +Mon Sep 24 12:55:12 UTC 2012 - lsle...@suse.cz + +- clear Rails cache at (re)start +- enable thread safe mode in production + +------------------------------------------------------------------- +Thu Sep 20 12:15:28 UTC 2012 - lsle...@suse.cz + +- webyast-base-branding-default - PreReq webyast-base (the + assets:join_manifests rake task is needed in %post) (bnc#779242) +- 0.3.24 + +------------------------------------------------------------------- +Thu Sep 20 07:04:33 UTC 2012 - lsle...@suse.cz + +- require rubygem-rake < 0.9 in SLES11 (bnc#777877) +- disabled background caching to avoid DelayedJob race conditions + (e.g. in bnc#780389, maybe in bnc#780387, bnc#779511, bnc#779537) +- 0.3.23 + +------------------------------------------------------------------- +Wed Sep 19 14:46:42 UTC 2012 - lsle...@suse.cz + +- nginx.conf - keep $PATH environment variable so e.g. `grep` + does not fail with "sh: grep: command not found" error + +------------------------------------------------------------------- +Fri Sep 14 14:56:58 UTC 2012 - lsle...@suse.cz + +- catch SQLite3::SQLException and retry DB access again + (SQLite does not support concurent write, this is just + a workaroud for possible race condition with delayed job) + +------------------------------------------------------------------- +Tue Sep 11 09:57:33 UTC 2012 - lsle...@suse.cz + +- CSS: fixed tabs (better visible active/inactive tab, display + horizontal delimiter) +- 0.3.22 + +------------------------------------------------------------------- +Mon Sep 10 09:41:04 UTC 2012 - lsle...@suse.cz + +- fixed PluginJob detection (bnc#779239) +- 0.3.21 + +------------------------------------------------------------------- +Fri Sep 7 12:54:55 UTC 2012 - lsle...@suse.cz + +- added token authentication support +- fixed PluginJob restart (bnc#779239) +- 0.3.20 + +------------------------------------------------------------------- +Thu Aug 30 14:32:07 UTC 2012 - lsle...@suse.cz + +- removed rubygem-ruby_parser dependency (needed only for "rake + gettext:find" when running from GIT) + +------------------------------------------------------------------- +Mon Aug 20 14:07:51 UTC 2012 - lsle...@suse.cz + +- webyast.css - added .clearfix rule (fixes broken layout in + patches) + +------------------------------------------------------------------- +Fri Aug 17 12:51:11 UTC 2012 - lsle...@suse.cz + +- online help initialization fix +- routing fixes/cleanup +- enabled caching for restdoc +- 0.3.19 + +------------------------------------------------------------------- +Thu Aug 16 10:51:53 UTC 2012 - lsle...@suse.cz + +- fixed displaying restdoc documentation (at /restdoc path) +- 0.3.18 + +------------------------------------------------------------------- +Tue Aug 14 11:13:06 UTC 2012 - lsle...@suse.cz + +- force SSL communication in production mode (use secure cookies + and use Strict-Transport-Security) +- added caching in online help (cache the downloaded page from + doc.opensuse.org, cache the result) +- 0.3.17 + +------------------------------------------------------------------- +Mon Aug 13 19:09:49 UTC 2012 - lsle...@suse.cz + +- removed rubygem-inifile dependency (inifile is needed for polkit1 + which is not present in SLES11, moreover inifile is not directly + needed) +- use rubygem-ruby-dbus also in SLES (will be part of ATK-1.3) + +------------------------------------------------------------------- +Fri Aug 10 07:29:29 UTC 2012 - lsle...@suse.cz + +- 0.3.16 + +------------------------------------------------------------------- +Thu Aug 9 12:35:47 UTC 2012 - lsle...@suse.cz + +- removed MSIE8 hacks (use gradients instead of PNGs in status eye) +- use HTTPS protocol instead of HTTP for reading online help + (decreases possibility of injecting malicious code to WebYaST + pages) + +------------------------------------------------------------------- +Wed Aug 8 13:27:02 UTC 2012 - lsle...@suse.cz + +- rcwebyast - print fingerprint of the generated certificate + +------------------------------------------------------------------- +Fri Aug 3 09:55:40 UTC 2012 - lsle...@suse.cz + +- correctly include IE CSS fixes +- better nginx/passenger config (include passenger_root.include + file instead of patching nginx config at every start) +- status eye - better look +- 0.3.15 + +------------------------------------------------------------------- +Thu Aug 2 16:04:14 UTC 2012 - lsle...@suse.cz + +- rcwebyast - added umask 0066 to avoid world readable log files +- supported browsers: IE9+ and FF10+ +- %post - make logs not world readable + +------------------------------------------------------------------- New: ---- config.yml.new ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-base.spec ++++++ --- /var/tmp/diff_new_pack.l5Hhgz/_old 2012-10-16 12:12:04.000000000 +0200 +++ /var/tmp/diff_new_pack.l5Hhgz/_new 2012-10-16 12:12:04.000000000 +0200 @@ -1,16 +1,23 @@ # -# spec file for package webyast-base (Version 0.1.19) +# spec file for package webyast-base # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: webyast-base -Version: 0.3.14 +Version: 0.3.27 Release: 0 Provides: yast2-webservice = %{version} Obsoletes: yast2-webservice < %{version} @@ -19,14 +26,14 @@ Obsoletes: webyast-base-ui < %{version} Obsoletes: webyast-base-ws < %{version} +Obsoletes: webyast-firstboot-ws < %{version} Obsoletes: yast2-webclient < %{version} Obsoletes: yast2-webservice < %{version} -Obsoletes: webyast-firstboot-ws < %{version} Provides: webyast-base-ui = %{version} Provides: webyast-base-ws = %{version} +Provides: webyast-firstboot-ws = %{version} Provides: yast2-webclient = %{version} Provides: yast2-webservice = %{version} -Provides: webyast-firstboot-ws = %{version} %if 0%{?suse_version} == 0 || %suse_version > 1110 # 11.2 or newer @@ -41,37 +48,37 @@ Requires: yast2-core >= 2.18.10 %else # 11.1 or SLES11 -Requires: yast2-core >= 2.17.30.1 Requires: sysvinit > 2.86-195.3.1 +Requires: yast2-core >= 2.17.30.1 %endif -Requires: rubygem-passenger-nginx, rubygem-nokogiri +Requires: check-create-certificate Requires: nginx >= 1.0 -Requires: sqlite3, syslog-ng, check-create-certificate, yast2-dbus-server - -%if 0%{?suse_version} == 0 || %suse_version <= 1130 -Requires: ruby-dbus -%else +Requires: rubygem-passenger-nginx Requires: rubygem-ruby-dbus -%endif +Requires: sqlite3 +Requires: syslog-ng +Requires: yast2-dbus-server -Requires: rubygem-webyast-rake-tasks >= 0.2, webyast-base-branding +Requires: rubygem-webyast-rake-tasks >= 0.2 +Requires: webyast-base-branding PreReq: rubygem-bundler # 634404 Recommends: logrotate %if 0%{?suse_version} == 0 || %suse_version > 1110 PreReq: polkit, rubygem-polkit1 +PreReq: rubygem-rake %else # <11.1 or SLES11 PreReq: PolicyKit, rubygem-polkit +PreReq: rubygem-rake < 0.9 %endif -PreReq: rubygem-rake, rubygem-sqlite3 +PreReq: rubygem-sqlite3 PreReq: rubygem-rails-3_2 >= 3.2.3 -PreReq: rubygem-fast_gettext, rubygem-gettext_i18n_rails, rubygem-inifile +PreReq: rubygem-fast_gettext, rubygem-gettext_i18n_rails +Url: http://en.opensuse.org/Portal:WebYaST +Summary: WebYaST - base components License: LGPL-2.1 and GPL-2.0 and Apache-2.0 Group: Productivity/Networking/Web/Utilities -URL: http://en.opensuse.org/Portal:WebYaST -Autoreqprov: on -Summary: WebYaST - base components Source: www.tar.bz2 Source1: webyastPermissionsService.rb Source2: webyast.permissions.conf @@ -85,49 +92,62 @@ Source12: nginx.conf Source13: control_panel.yml Source14: config.yml +Source15: config.yml.new BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: ruby, pkg-config, rubygem-mocha +BuildRequires: pkg-config +BuildRequires: ruby +BuildRequires: rubygem-mocha # if we run the tests during build, we need most of Requires here too, # except for deployment specific stuff -BuildRequires: rubygem-webyast-rake-tasks >= 0.2 -BuildRequires: sqlite3, dbus-1 -%if 0%{?suse_version} == 0 || %suse_version <= 1130 -BuildRequires: ruby-dbus -%else +BuildRequires: dbus-1 +BuildRequires: rubygem-rails-3_2 BuildRequires: rubygem-ruby-dbus -%endif BuildRequires: rubygem-sqlite3 -BuildRequires: rubygem-rails-3_2 +BuildRequires: rubygem-webyast-rake-tasks >= 0.2 +BuildRequires: sqlite3 %if 0%{?suse_version} == 0 || %suse_version > 1110 -BuildRequires: polkit, rubygem-polkit1 +BuildRequires: polkit +BuildRequires: rubygem-polkit1 %else # <11.1 or SLES11 -BuildRequires: PolicyKit, rubygem-polkit +BuildRequires: PolicyKit +BuildRequires: rubygem-polkit %endif # the testsuite is run during build -BuildRequires: rubygem-test-unit rubygem-mocha -BuildRequires: rubygem-haml, rubygem-nokogiri, rubygem-builder-3_0 BuildRequires: nginx >= 1.0 +BuildRequires: rubygem-builder-3_0 BuildRequires: rubygem-bundler -BuildRequires: rubygem-devise, rubygem-devise_unix2_chkpwd_authenticatable, rubygem-devise-i18n -BuildRequires: rubygem-cancan, rubygem-delayed_job-3_0, rubygem-delayed_job_active_record - -BuildRequires: rubygem-gettext, rubygem-ruby_parser, rubygem-inifile - -BuildRequires: rubygem-factory_girl, rubygem-factory_girl_rails, rubygem-mocha - -Requires: rubygem-haml, rubygem-sqlite3, rubygem-builder-3_0 -Requires: rubygem-fast_gettext, rubygem-gettext_i18n_rails, rubygem-rails-i18n +BuildRequires: rubygem-cancan +BuildRequires: rubygem-devise +BuildRequires: rubygem-devise-i18n +BuildRequires: rubygem-devise_unix2_chkpwd_authenticatable +BuildRequires: rubygem-haml +BuildRequires: rubygem-mocha +BuildRequires: rubygem-test-unit -Requires: rubygem-devise, rubygem-devise_unix2_chkpwd_authenticatable, rubygem-devise-i18n -Requires: rubygem-cancan, rubygem-delayed_job-3_0, rubygem-delayed_job_active_record +BuildRequires: rubygem-gettext +BuildRequires: rubygem-factory_girl +BuildRequires: rubygem-factory_girl_rails +BuildRequires: rubygem-mocha + +Requires: rubygem-builder-3_0 +Requires: rubygem-fast_gettext +Requires: rubygem-gettext_i18n_rails +Requires: rubygem-haml +Requires: rubygem-rails-i18n +Requires: rubygem-sqlite3 + +Requires: rubygem-cancan +Requires: rubygem-devise +Requires: rubygem-devise-i18n +Requires: rubygem-devise_unix2_chkpwd_authenticatable # This is for Hudson (build service) to setup the build env correctly %if 0 -BuildRequires: rubygem-test-unit BuildRequires: rubygem-rcov >= 0.9.3.2 +BuildRequires: rubygem-test-unit %endif # we do not necessarily need any UI in case of WebYaST @@ -143,15 +163,18 @@ BuildArch: noarch %package testsuite -Group: Productivity/Networking/Web/Utilities Requires: webyast-base = %{version} Summary: Testsuite for webyast-base package +Group: Productivity/Networking/Web/Utilities # %define pkg_home /var/lib/%{webyast_user} # -Requires: rubygem-factory_girl, rubygem-factory_girl_rails, rubygem-mocha, tidy +Requires: rubygem-factory_girl +Requires: rubygem-factory_girl_rails +Requires: rubygem-mocha +Requires: tidy %description WebYaST - Core components for UI and REST based interface to system manipulation. @@ -166,16 +189,16 @@ Testsuite for core WebYaST package. %package branding-default -Group: Productivity/Networking/Web/Utilities Provides: webyast-base-branding = %{version} -Requires: %{name} = %{version} +PreReq: %{name} = %{version} Conflicts: otherproviders(webyast-base-branding) Supplements: packageand(webyast-base:branding-default) -Provides: webyast-base-ui-branding-default -Obsoletes: webyast-base-ui-branding-default +Provides: webyast-base-ui-branding-default = %{version} +Obsoletes: webyast-base-ui-branding-default < %{version} Summary: Branding package for webyast-base package +Group: Productivity/Networking/Web/Utilities %description branding-default This package contains css, icons and images for webyast-base package. @@ -189,7 +212,8 @@ export WEBYAST_POLICYKIT='true' %endif # build *.mo files (redirect sterr to /dev/null as it contains tons of warnings about obsoleted (commented) msgids) -LANG=en rake gettext:pack 2> /dev/null +# if the task fails run it again and show the details of the failure for debugging +LANG=en rake gettext:pack 2> /dev/null || LANG=en rake -t gettext:pack # gettext:pack for some reason creates empty db/development.sqlite3 file rm -rf db/development.sqlite3 @@ -217,7 +241,6 @@ rake tmp:create RAILS_ENV=test $RPM_BUILD_ROOT%{webyast_dir}/test/dbus-launch-simple rake test - #--------------------------------------------------------------- %install @@ -228,18 +251,18 @@ # # Install all web and frontend parts. # -mkdir -p $RPM_BUILD_ROOT%{webyast_dir}/log/ +mkdir -p $RPM_BUILD_ROOT%{webyast_dir} cp -a * $RPM_BUILD_ROOT%{webyast_dir}/ -rm -f $RPM_BUILD_ROOT%{webyast_dir}/log/* +rm -f $RPM_BUILD_ROOT%{webyast_dir}/log rm -rf $RPM_BUILD_ROOT/%{webyast_dir}/po rm -f $RPM_BUILD_ROOT%{webyast_dir}/COPYING # install production mode Gemfile -rake gemfile:production > $RPM_BUILD_ROOT%{webyast_dir}/Gemfile +rake -s gemfile:production > $RPM_BUILD_ROOT%{webyast_dir}/Gemfile # install test mode Gemfile -rake gemfile:test > $RPM_BUILD_ROOT%{webyast_dir}/Gemfile.test +rake -s gemfile:test > $RPM_BUILD_ROOT%{webyast_dir}/Gemfile.test # install assets mode Gemfile -rake gemfile:assets > $RPM_BUILD_ROOT%{webyast_dir}/Gemfile.assets +rake -s gemfile:assets > $RPM_BUILD_ROOT%{webyast_dir}/Gemfile.assets # remove .gitkeep files find $RPM_BUILD_ROOT%{webyast_dir} -name .gitkeep -delete @@ -247,7 +270,6 @@ # remove *.po files (compiled *.mo files are sufficient) find $RPM_BUILD_ROOT%{webyast_dir}/locale -name '*.po' -delete - %{__install} -d -m 0755 \ %{buildroot}%{pkg_home}/sockets/ \ %{buildroot}%{pkg_home}/cache/ \ @@ -309,6 +331,8 @@ %if %suse_version <= 1110 cp %SOURCE14 $RPM_BUILD_ROOT/etc/webyast/ +%else +cp %SOURCE15 $RPM_BUILD_ROOT/etc/webyast/config.yml %endif # install permissions service @@ -402,16 +426,11 @@ %if %suse_version <= 1110 export WEBYAST_POLICYKIT='true' %endif -DISABLE_DATA_PREFETCH=true RAILS_ENV=production rake db:migrate +RAILS_ENV=production rake db:migrate chown -R %{webyast_user}: db -chown -R %{webyast_user}: log +chown -R %{webyast_user}: /var/log/webyast +chmod -R o-r /var/log/webyast echo "Database is ready" -# -# patching nginx configuration -# -if [ -d /usr/lib64 ]; then - sed -i "s/passenger_root \/usr\/lib/passenger_root \/usr\/lib64/" /etc/webyast/nginx.conf -fi # try-reload D-Bus config (bnc#635826) # check if the system bus socket is present to avoid errors/hangs during RPM build (bnc#767066) @@ -500,7 +519,6 @@ %attr(444,root,root) /usr/share/dbus-1/system-services/webyast.permissions.service.service %attr(644,root,root) %config /etc/dbus-1/system.d/webyast.permissions.conf %doc %{webyast_dir}/README -%attr(-,%{webyast_user},%{webyast_user}) %{webyast_dir}/log %attr(-,%{webyast_user},%{webyast_user}) %{webyast_dir}/tmp %dir %{webyast_vardir} %attr(-,%{webyast_user},%{webyast_user}) %dir %{webyast_vardir}/basesystem @@ -509,11 +527,9 @@ #this /etc/webyast is for webyast configuration files %dir /etc/webyast/ %config /etc/webyast/control_panel.yml -%if %suse_version <= 1110 %config /etc/webyast/config.yml -%endif #nginx stuff -%config(noreplace) /etc/webyast/nginx.conf +%config /etc/webyast/nginx.conf %config /etc/webyast/fastcgi.conf %config /etc/webyast/fastcgi_params %config /etc/webyast/koi-utf @@ -561,4 +577,5 @@ %exclude %{webyast_dir}/public/assets/manifest.yml.base #--------------------------------------------------------------- + %changelog ++++++ config.yml.new ++++++ # This is a general config file for WebYaST # # The file needs to be located under /etc/webyast/ --- # Enable/disable XML REST API # default: false rest_api_enabled: false # Enable/disable Web UI # default: true web_ui_enabled: true ++++++ control_panel.yml ++++++ --- /var/tmp/diff_new_pack.l5Hhgz/_old 2012-10-16 12:12:04.000000000 +0200 +++ /var/tmp/diff_new_pack.l5Hhgz/_new 2012-10-16 12:12:04.000000000 +0200 @@ -6,8 +6,8 @@ --- # timeout before automatic reloading of patches status (in seconds) # value 0 disables automatic reload -# default: 28800 seconds = 8 hours -patch_status_timeout: 28800 +# default: 3600 seconds = 1 hour +patch_status_timeout: 3600 # timeout before automatic reloading of patches status (in seconds) # value 0 disables automatic reload ++++++ nginx.conf ++++++ --- /var/tmp/diff_new_pack.l5Hhgz/_old 2012-10-16 12:12:04.000000000 +0200 +++ /var/tmp/diff_new_pack.l5Hhgz/_new 2012-10-16 12:12:04.000000000 +0200 @@ -1,24 +1,21 @@ +# Nginx configuration file for WebYaST user webyast webyast; worker_processes 1; - -#error_log logs/error.log; -#error_log logs/error.log notice; -#error_log logs/error.log info; -error_log /srv/www/webyast/log/error.log info; - +error_log /var/log/webyast/error.log info; pid /var/run/webyast.pid; +# keep $PATH variable +env PATH; events { worker_connections 1024; } - http { - # Note: passenger_root option is automatically updated by - # /etc/init.d/webyast script at start up - passenger_root /usr/lib64/ruby/gems/1.8/gems/passenger-3.0.1; + # read passenger_root option from external file (in rubygem-passenger-nginx package) + include /etc/nginx/conf.d/passenger_root.include; + passenger_ruby /usr/bin/ruby; passenger_pool_idle_time 300; passenger_min_instances 0; @@ -35,9 +32,9 @@ include mime.types; default_type application/octet-stream; - access_log /srv/www/webyast/log/access.log; + access_log /var/log/webyast/access.log; passenger_log_level 0; - passenger_debug_log_file /srv/www/webyast/log/passenger.log; + passenger_debug_log_file /var/log/webyast/passenger.log; sendfile on; #tcp_nopush on; ++++++ rcwebyast ++++++ --- /var/tmp/diff_new_pack.l5Hhgz/_old 2012-10-16 12:12:04.000000000 +0200 +++ /var/tmp/diff_new_pack.l5Hhgz/_new 2012-10-16 12:12:04.000000000 +0200 @@ -171,19 +171,26 @@ # with force-reload (in case signaling is not supported) are # considered a success. +# set default file permissions to -rw------ +# (log files should not be readable by all) +umask 0066 + case "$1" in start) if [ ! -e $COMBINEDCERTFILE ] then echo "No certificate found. Creating one now." - if ! /usr/sbin/check-create-certificate -c -C $CERTIFICATEFILE -K $CERTKEYFILE -B $COMBINEDCERTFILE -D webyast -O WebYaST -U WebYaST >/srv/www/webyast/log/check-create-certificate.log 2>&1 + LOG_FILE="/var/log/webyast/check-create-certificate.log" + if ! /usr/sbin/check-create-certificate -c -C $CERTIFICATEFILE -K $CERTKEYFILE -B $COMBINEDCERTFILE -D webyast -O WebYaST -U WebYaST > $LOG_FILE 2>&1 then - echo -n "Can not create certificate. Please see /srv/www/webyast/log/check-create-certificate.log for details." + echo -n "Can not create certificate. Please see $LOG_FILE for details." rc_failed rc_status -v rc_exit fi chown nginx:nginx $CERTIFICATEFILE $CERTKEYFILE $COMBINEDCERTFILE + echo -n "Created certificate: " + openssl x509 -in $CERTIFICATEFILE -fingerprint -noout fi echo -n "Starting webyast " @@ -192,6 +199,9 @@ rm -f $GEMFILE_LOCK #generate deployment specific secret key (bnc#591345) SECRET=`cd /srv/www/webyast/ && rake -s secret` + + # make the lock file readable for all + chmod a+r $GEMFILE_LOCK if [ -z $SECRET ]; then echo -n "Cannot generate secret for session. Run 'cd /srv/www/webyast/ && rake -s secret' for details." rc_failed @@ -200,9 +210,8 @@ fi sed -i 's/9d11bfc98abcf9799082d9c34ec94dc1cc926f0f1bf4bea8c440b497d96b14c1f712c8784d0303ee7dd69e382c3e5e4d38d4c56d1b619eae7acaa6516cd733b1/'"$SECRET"/ /srv/www/webyast/config/environment.rb - # patch passenger config root if the current config is different (after updating passenger or on a different arch than the default) - grep -q "^[ \\t]*passenger_root[ \\t][ \\t]*`passenger-config --root`;" $NGINX_CONFIG || - sed -i.bak "s#^\\([ \\t]*\\)passenger_root[ \\t].*\$#\\1passenger_root `passenger-config --root`;#" $NGINX_CONFIG + # clear cache (drop possibly obsoleted values) + (cd /srv/www/webyast/ && rake -s tmp:cache:clear) ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. @@ -216,7 +225,7 @@ IFC=`LC_ALL=C route | grep "^default" | tr -s " " | cut -d " " -f 8` IP=`LC_ALL=C ifconfig $IFC | grep "inet addr" | cut -d ":" -f 2 | cut -d " " -f 1` PORT=`LC_ALL=C grep "listen" $NGINX_CONFIG|cut -d ";" -f 1|tr -s " "|cut -d " " -f 3` - HNAME=`hostname -f` + HNAME=`hostname -f 2> /dev/null` if [ -n "$HNAME" ]; then HNAME=" (https://$HNAME:$PORT/)" ++++++ webyast.lr.conf ++++++ --- /var/tmp/diff_new_pack.l5Hhgz/_old 2012-10-16 12:12:05.000000000 +0200 +++ /var/tmp/diff_new_pack.l5Hhgz/_new 2012-10-16 12:12:05.000000000 +0200 @@ -1,4 +1,4 @@ -/srv/www/webyast/log/production.log /srv/www/webyast/log/development.log /srv/www/webyast/log/access.log /srv/www/webyast/log/error.log /srv/www/webyast/log/permission_service.log /srv/www/webyast/log/passenger.log { +/var/log/webyast/production.log /var/log/webyast/development.log /var/log/webyast/access.log /var/log/webyast/error.log /var/log/webyast/permission_service.log /var/log/webyast/passenger.log { compress dateext maxage 365 ++++++ webyastPermissionsService.rb ++++++ --- /var/tmp/diff_new_pack.l5Hhgz/_old 2012-10-16 12:12:05.000000000 +0200 +++ /var/tmp/diff_new_pack.l5Hhgz/_new 2012-10-16 12:12:05.000000000 +0200 @@ -62,8 +62,9 @@ end def log(msg) - f = File.new("/srv/www/webyast/log/permission_service.log","a",0600) - f.write(msg+"\n") + f = File.new("/var/log/webyast/permission_service.log", "a", 0600) + f.write msg + f.write "\n" f.close end ++++++ www.tar.bz2 ++++++ ++++ 4087 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
