| @@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<image schemaversion="5.1" name="obs-worker-pxe-xen" displayname="OBS_Worker">
<description type="system">
- <author>Adrian Schröter</author>
- <contact>adrian@suse.de</contact>
+ <author>Carsten Schoene</author>
+ <contact>cs@j0ke.net</contact>
<specification>Open Build Service(OBS) Worker</specification>
</description>
<preferences>
- <type compressed="true" filesystem="ext4" boot="netboot/suse-11.4" image="pxe" bootkernel="xenk" bootprofile="xen" />
+ <type compressed="true" filesystem="ext4" boot="netboot/suse-SLES11" image="pxe" bootkernel="xenk" bootprofile="xen" />
<!-- empty
just to convince diff3 on version updates
-->
@@ -20,24 +20,24 @@
<!-- users with default password. may a problem with running sshd, but you need to run the workers anyway in a secure network -->
<users group="opensuse">
- <user name="root" pwd="opensuse" home="/root" pwdformat="plain" />
+ <user name="root" pwd="installObs++" home="/root" pwdformat="plain" />
</users>
<users group="obsrun" id="105">
<user name="obsrun" home="/var/lib/empty" shell="/bin/false" id="103" pwd="*" pwdformat="plain" />
</users>
<repository type="rpm-md">
- <source path="obs://openSUSE:Tools/openSUSE_11.4"/>
+ <source path="obs://openSUSE:Tools/SLE_11_SP2"/>
</repository>
<repository type="rpm-md">
- <source path="obs://openSUSE:11.4:Update/standard"/>
+ <source path="obs://SLE_11_SP2:Updates/oss"/>
</repository>
<repository type="rpm-md">
- <source path="obs://openSUSE:11.4/standard"/>
+ <source path="obs://SLE_11_SP2/oss"/>
</repository>
<packages type="image">
<package name="sysvinit"/> <!-- OBS services are not running correctly with systemd -->
- <package name="openSUSE-release-mini"/> <!-- base system -->
+ <package name="sles-release"/> <!-- base system -->
<package name="bind-libs"/>
<package name="bind-utils"/>
<package name="e2fsprogs"/>
@@ -57,7 +57,7 @@
<package name="grub"/>
<package name="sysfsutils"/>
<package name="bootsplash"/>
- <package name="glib2-branding-openSUSE"/>
+ <package name="glib2-branding-SLES"/>
<package name="ifplugd"/>
<package name="vim"/>
<package name="less"/>
@@ -70,7 +70,6 @@
<package name="memtest86+"/>
<package name="adaptec-firmware"/>
<package name="openSUSE-build-key"/>
- <package name="openSUSE-release"/>
<package name="OBS-Addon-release"/>
<package name="obs-worker"/> <!-- OBS worker -->
|
| @@ -56,7 +56,9 @@
# hardwired ntp server config, in case dhcp distribution of ntp config is not working
echo "" >> /etc/ntp.conf
-echo "server ntp1" >> /etc/ntp.conf
+echo "server ptbtime1.ptb.de" >> /etc/ntp.conf
+echo "server ptbtime2.ptb.de" >> /etc/ntp.conf
+echo "server ptbtime3.ptb.de" >> /etc/ntp.conf
echo "multicastclient" >> /etc/ntp.conf
# allow root login via serial console for debugging
@@ -72,26 +74,26 @@
#======================================
# Configure OBS to use /obs by default
#--------------------------------------
-sed -i 's,/srv/obs,/obs,g' /usr/lib/obs/server/BSConfig.pm
-sed -i 's,.*our $serviceserve.*,our $serviceserver = "http://$hostname:5152";,' /usr/lib/obs/server/BSConfig.pm
-sed -i 's,^our $repodownload.*,our $repodownload = "http://$hostname:82/";,' /usr/lib/obs/server/BSConfig.pm
+#sed -i 's,/srv/obs,/obs,g' /usr/lib/obs/server/BSConfig.pm
+#sed -i 's,.*our $serviceserve.*,our $serviceserver = "http://$hostname:5152";,' /usr/lib/obs/server/BSConfig.pm
+#sed -i 's,^our $repodownload.*,our $repodownload = "http://$hostname:82/";,' /usr/lib/obs/server/BSConfig.pm
sed -i 's,^OBS_RUN_DIR=.*,OBS_RUN_DIR="/obs/run",' /etc/sysconfig/obs-server
sed -i 's,^OBS_LOG_DIR=.*,OBS_LOG_DIR="/obs/log",' /etc/sysconfig/obs-server
-sed -i 's,^datadir.=.*,datadir = /obs/MySQL,' /etc/my.cnf
-sed -i '/^\[mysqld_multi\]/adatadir = /obs/MySQL' /etc/my.cnf # config of openSUSE 11.4 does not come with a default dir for its default mode
+#sed -i 's,^datadir.=.*,datadir = /obs/MySQL,' /etc/my.cnf
+#sed -i '/^\[mysqld_multi\]/adatadir = /obs/MySQL' /etc/my.cnf # config of openSUSE 11.4 does not come with a default dir for its default mode
# signing setup
-sed -i 's,.*our $gpg_standard_key.*,our $gpg_standard_key = "/obs/obs-default-gpg.asc";,' /usr/lib/obs/server/BSConfig.pm
-sed -i 's,.*our $keyfile.*,our $keyfile = "/obs/obs-default-gpg.asc";,' /usr/lib/obs/server/BSConfig.pm
-sed -i 's,.*our $sign = .*,our $sign = "/usr/bin/sign";,' /usr/lib/obs/server/BSConfig.pm
-sed -i 's,.*our $forceprojectkeys.*,our $forceprojectkeys = 1;,' /usr/lib/obs/server/BSConfig.pm
-chmod 4755 /usr/bin/sign
+#sed -i 's,.*our $gpg_standard_key.*,our $gpg_standard_key = "/obs/obs-default-gpg.asc";,' /usr/lib/obs/server/BSConfig.pm
+#sed -i 's,.*our $keyfile.*,our $keyfile = "/obs/obs-default-gpg.asc";,' /usr/lib/obs/server/BSConfig.pm
+#sed -i 's,.*our $sign = .*,our $sign = "/usr/bin/sign";,' /usr/lib/obs/server/BSConfig.pm
+#sed -i 's,.*our $forceprojectkeys.*,our $forceprojectkeys = 1;,' /usr/lib/obs/server/BSConfig.pm
+#chmod 4755 /usr/bin/sign
#======================================
# Add Default Repositories
#--------------------------------------
-zypper ar http://download.opensuse.org/update/11.4/ openSUSE:11.4:Update
-zypper ar http://download.opensuse.org/repositories/openSUSE:11.4/standard openSUSE:11.4
-zypper ar http://download.opensuse.org/repositories/openSUSE:Tools/openSUSE_11.4 openSUSE:Tools
+#zypper ar http://download.opensuse.org/update/11.4/ openSUSE:11.4:Update
+#zypper ar http://download.opensuse.org/repositories/openSUSE:11.4/standard openSUSE:11.4
+zypper ar http://download.opensuse.org/repositories/openSUSE:Tools/SLE_11_SP2 openSUSE:Tools
#======================================
# Umount kernel filesystems
|
