From danderson@lnxi.com Fri May 11 23:05:59 2007
From: "David B. Anderson" <danderson@lnxi.com>
To: buildservice@lists.opensuse.org
Subject: [opensuse-buildservice] Patches to easy Stand Alone OBS install.
Date: Fri, 11 May 2007 17:10:07 -0600
Message-ID: <4644F7CF.3060306@lnxi.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1400090704536884853=="

--===============1400090704536884853==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi,

Here are some patches to make setting up a stand alone OBS install easier.
They mostly remove some hard code URLs, allowing the use of the=20
environment configuration files.

Also included is a patch for the obs-server.spec file to make it work=20
with a tarball made from current development tree.

All of the patches are against r1638.


--=20
David B. Anderson=20
Linux Networx
Sr. Software Engineer
Email: danderson(a)lnxi.com
Phone: (801) 649-1311


--- ../obs-r/buildservice/src/webclient/app/helpers/application_helper.rb	200=
7-05-11 16:04:41.000000000 -0600
+++ buildservice/src/webclient/app/helpers/application_helper.rb	2007-05-11 1=
5:46:42.000000000 -0600
@@ -28,8 +28,12 @@
       :project =3D> project, :package =3D> package
   end
=20
+  def link_to_repo(message=3D'', repo=3D'')
+    link_to "Build Service Software #{message}", URL_SW_REPO_HOST + "/#{repo=
}"
+  end
+
   def repo_url(project, repo=3D'' )
-    'http://software.opensuse.org/download/' + project.gsub(':', ':/') + "/#=
{repo}"
+    URL_SW_REPO_HOST + '/download/' + project.gsub(':', ':/') + "/#{repo}"
   end
=20
=20

--- ../obs-r/buildservice/src/backend/BSConfig.pm	2007-05-11 16:04:41.0000000=
00 -0600
+++ buildservice/src/backend/BSConfig.pm	2007-05-11 15:46:42.000000000 -0600
@@ -27,6 +27,8 @@
 our $stageserver =3D 'rsync://149.44.161.5/put-repos-main';
 our $stageserver_sync =3D 'rsync://149.44.161.5/trigger-repos-sync';
 our $repodownload =3D 'http://software.opensuse.org/download/repositories';
+our $gpgkeyurl =3D 'http://software.opensuse.org/openSUSE-Build-Service.asc';
+our $gpgcheck_flag =3D'1';
 our $sign =3D '/root/bin/sign';
 our $bsdir =3D '/bs';
 our $keyfile =3D '/bs/openSUSE-Build-Service.asc';

--- ../obs-r/buildservice/src/webclient/config/environments/development.rb	20=
07-05-11 16:04:41.000000000 -0600
+++ buildservice/src/webclient/config/environments/development.rb	2007-05-11 =
15:46:42.000000000 -0600
@@ -42,3 +42,8 @@
 ### ICHAIN_HOST =3D "212.12.12.12"
 ICHAIN_TEST_USER =3D "test"
=20
+# Software Repository Machine Path
+URL_SW_REPO_HOST =3D "http://software.opensuse.org"
+
+# API Machine URL
+URL_API_HOST =3D"https://api.opensuse.org"

--- ../obs-r/buildservice/src/webclient/app/views/main/index.rhtml	2007-05-11=
 16:04:41.000000000 -0600
+++ buildservice/src/webclient/app/views/main/index.rhtml	2007-05-11 15:46:42=
.000000000 -0600
@@ -16,7 +16,10 @@
 It can build packages for various Linux distributions.<br/>
 Most of the advanced features are still missing, but the basic build functio=
nality is there.</p>
=20
-<p class=3D"description">Everyone can download the resulting software packag=
es via the <a href=3D"http://software.opensuse.org">software browsing interfa=
ce</a>.</p>
+<p class=3D"description">Everyone can download the resulting software packag=
es via the=20
+   <%=3D link_to_repo 'browsing interface'
+   -%>.
+</p>
=20
=20
 <!--

--- ../obs-r/buildservice/src/webclient/app/helpers/package_helper.rb	2007-05=
-11 16:04:41.000000000 -0600
+++ buildservice/src/webclient/app/helpers/package_helper.rb	2007-05-11 15:46=
:42.000000000 -0600
@@ -4,25 +4,29 @@
   def build_log_url( project, package, platform, arch )
     #get_frontend_url_for( :controller =3D> 'result' ) +
     #  "/#{project}/#{platform}/#{package}/#{arch}/log"
-    "https://api.opensuse.org/result/#{project}/#{platform}/#{package}/#{arc=
h}/log"
+    URL_API_HOST + '/result/' + "#{project}/#{platform}/#{package}/#{arch}/l=
og"
   end
=20
=20
   def file_url( project, package, filename )
     #get_frontend_url_for( :controller =3D> 'source') +
     #  "/#{project}/#{package}/#{filename}"
-    "https://api.opensuse.org/source/#{project}/#{package}/#{filename}"
+    URL_API_HOST + '/source/' + "#{project}/#{package}/#{filename}"
   end
=20
=20
   def rpm_url( project, package, repository, arch, filename )
     #get_frontend_url_for( :controller =3D> 'rpm' ) +
     #  "/#{project}/#{repository}/#{package}/#{arch}/#{filename}"
-    "https://api.opensuse.org/rpm/#{project}/#{repository}/#{package}/#{arch=
}/#{filename}"
+    URL_API_HOST + '/rpm/' + "#{project}/#{repository}/#{package}/#{arch}/#{=
filename}"
   end
=20
   def human_readable_fsize( bytes )
-    number_to_human_size(bytes, 2)
+    hs =3D number_to_human_size(bytes.to_i)
+    if hs =3D=3D nil
+      hs =3D bytes
+    end
+    hs
   end
=20
 end

--- ../obs-r/buildservice/src/webclient/app/views/user/request_ichain.rhtml	2=
007-05-11 16:04:41.000000000 -0600
+++ buildservice/src/webclient/app/views/user/request_ichain.rhtml	2007-05-11=
 15:46:42.000000000 -0600
@@ -12,7 +12,7 @@
   </p>
   <p>
   You do NOT need an account to download packages. Please go to
-  <a href=3D"http://software.opensuse.org/download/">http://software.opensus=
e.org/download/</a>
+  <%=3D link_to_repo 'downloads', 'download' %>
   for downloading packages.
   </p>
   <p>The build service team will enable your account for the=20

--- ../obs-r/buildservice/src/backend/worker/BSConfig.pm	2007-05-11 16:04:41.=
000000000 -0600
+++ buildservice/src/backend/worker/BSConfig.pm	2007-05-11 15:46:42.000000000=
 -0600
@@ -27,6 +27,8 @@
 our $stageserver =3D 'rsync://149.44.161.5/put-repos-main';
 our $stageserver_sync =3D 'rsync://149.44.161.5/trigger-repos-sync';
 our $repodownload =3D 'http://software.opensuse.org/download/repositories';
+our $gpgkeyurl =3D 'http://software.opensuse.org/openSUSE-Build-Service.asc';
+our $gpgcheck_flag =3D'1';
 our $sign =3D '/root/bin/sign';
 our $bsdir =3D '/bs';
 our $keyfile =3D '/bs/openSUSE-Build-Service.asc';

--- /home/danderson/Work/src/tmp/obs/rpm/obs-server.spec.org	2007-05-01 17:17=
:51.000000000 -0600
+++ obs-server.spec	2007-05-11 16:22:46.000000000 -0600
@@ -75,17 +75,44 @@
 #
 # Install all web and frontend parts.
 #
+
+# First make sure our build root is clean
+rm -rf %{buildroot}
+mkdir -p %{buildroot}
+
+
 for i in common frontend webclient; do
   mkdir -p $RPM_BUILD_ROOT/srv/www/obs/
   cp -a $i $RPM_BUILD_ROOT/srv/www/obs/$i
 done
+
+#These are to fix the files requires section below as these=20
+#directories have been removed from the tarball.
+#If these directories are not really needed then remove this section
+#and the entries in the file section
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/frontend/components
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/frontend/log
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/frontend/tmp
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/frontend/tmp/sockets
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/frontend/tmp/sessions
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/frontend/tmp/cache
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/webclient/components
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/webclient/db
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/webclient/vendor
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/webclient/log
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/webclient/tmp
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/webclient/tmp/sockets
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/webclient/tmp/sessions
+install -d -m 755 $RPM_BUILD_ROOT/srv/www/obs/webclient/tmp/cache
+
+
 # configure lighttpd web service
 mkdir -p $RPM_BUILD_ROOT/etc/lighttpd/vhosts.d/
 install -m 0644 %SOURCE7 $RPM_BUILD_ROOT/etc/lighttpd/vhosts.d/
 install -m 0644 %SOURCE9 $RPM_BUILD_ROOT/etc/lighttpd/vhosts.d/rails.inc
 install -m 0644 %SOURCE8 $RPM_BUILD_ROOT/etc/lighttpd/
-rm $RPM_BUILD_ROOT/srv/www/obs/frontend/README_LOGIN
-rm $RPM_BUILD_ROOT/srv/www/obs/frontend/files/specfiletemplate
+rm -f $RPM_BUILD_ROOT/srv/www/obs/frontend/README_LOGIN
+rm -f $RPM_BUILD_ROOT/srv/www/obs/frontend/files/specfiletemplate
 # fix path
 for i in $RPM_BUILD_ROOT/srv/www/obs/*/config/environment.rb; do
   sed "s,/srv/www/opensuse/common/current/lib,/srv/www/obs/common/lib," \

--===============1400090704536884853==--


From abauer@suse.de Tue May 15 15:20:37 2007
From: Andreas Bauer <abauer@suse.de>
To: buildservice@lists.opensuse.org
Subject: Re: [opensuse-buildservice] Patches to easy Stand Alone OBS install.
Date: Tue, 15 May 2007 17:20:35 +0200
Message-ID: <200705151720.35622.abauer@suse.de>
In-Reply-To: <4644F7CF.3060306@lnxi.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0031526204495315743=="

--===============0031526204495315743==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

On Saturday, 12. May 2007 01:10, David B. Anderson wrote:
> Hi,
>
> Here are some patches to make setting up a stand alone OBS install easier.
> They mostly remove some hard code URLs, allowing the use of the
> environment configuration files.

Cool, thanks.

A few comments:

+  def link_to_repo(message=3D'', repo=3D'')
+    link_to "Build Service Software #{message}", URL_SW_REPO_HOST=20
+ "/#{repo}"
+  end

I'll remove the "Build Service Software" prefix, as this makes it very=20
difficult to see what the final displayed text is.

-    number_to_human_size(bytes, 2)
+    hs =3D number_to_human_size(bytes.to_i)
+    if hs =3D=3D nil
+      hs =3D bytes
+    end
+    hs

I don't see the need for that. number_to_human_size can only return nil if th=
e=20
argument is nil. So your check effectively does nothing, because if hs =3D=3D=
=20
nil, bytes =3D=3D nil. Additionally, the argument can never be nil as to_i, i=
f=20
defined, is guaranteed to always return an integer.

I'll check in the fixes for the hardcoded URLs if no one else has objections.

> Also included is a patch for the obs-server.spec file to make it work
> with a tarball made from current development tree.
>
> All of the patches are against r1638.

--=20
Andreas Bauer - Novell - SUSE Internal Tools
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-buildservice+help(a)opensuse.org

--===============0031526204495315743==--


From danderson@lnxi.com Tue May 15 16:01:03 2007
From: "David B. Anderson" <danderson@lnxi.com>
To: buildservice@lists.opensuse.org
Subject: Re: [opensuse-buildservice] Patches to easy Stand Alone OBS install.
Date: Tue, 15 May 2007 10:00:38 -0600
Message-ID: <4649D926.7060200@lnxi.com>
In-Reply-To: <200705151720.35622.abauer@suse.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6540496215895083594=="

--===============6540496215895083594==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Thanks,

Andreas Bauer wrote:
> On Saturday, 12. May 2007 01:10, David B. Anderson wrote:
>  =20
>> Hi,
>>
>> Here are some patches to make setting up a stand alone OBS install easier.
>> They mostly remove some hard code URLs, allowing the use of the
>> environment configuration files.
>>    =20
>
> Cool, thanks.
>
> A few comments:
>
> +  def link_to_repo(message=3D'', repo=3D'')
> +    link_to "Build Service Software #{message}", URL_SW_REPO_HOST=20
> + "/#{repo}"
> +  end
>
>  =20
> I'll remove the "Build Service Software" prefix, as this makes it very=20
> difficult to see what the final displayed text is.
>
>  =20
Just trying to make the end user experience the same.

> -    number_to_human_size(bytes, 2)
> +    hs =3D number_to_human_size(bytes.to_i)
> +    if hs =3D=3D nil
> +      hs =3D bytes
> +    end
> +    hs
>
> I don't see the need for that. number_to_human_size can only return nil if =
the=20
> argument is nil. So your check effectively does nothing, because if hs =3D=
=3D=20
> nil, bytes =3D=3D nil. Additionally, the argument can never be nil as to_i,=
 if=20
> defined, is guaranteed to always return an integer.
>
>  =20
During the initial OBS install, I was having problems with this function=20
causing the pages to abort with exceptions. After I put the check for=20
nil, I figured out bytes was a numerical string, hence .to_i. I left the=20
nil check just in case bytes ever contained a none numeric value. This=20
is a pure sanity check. I try to make it so that after I hit a problem,=20
it will never come back.


> I'll check in the fixes for the hardcoded URLs if no one else has objection=
s.
>
>  =20
>> Also included is a patch for the obs-server.spec file to make it work
>> with a tarball made from current development tree.
>>
>> All of the patches are against r1638.
>>    =20
>
>  =20
Looking forward to the updates.

Thanks.

--=20
David B. Anderson=20
Linux Networx
Sr. Software Engineer
Email: danderson(a)lnxi.com
Phone: (801) 649-1311

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-buildservice+help(a)opensuse.org

--===============6540496215895083594==--