From: opensides Date: Tue, 22 Sep 2009 13:32:45 +0000 (+0000) Subject: - Added a new parameter to allow people that have aother arch than i386 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7dae67e5f7a9ae06e073bee065bdd23c271c6d16;p=gosa.git - Added a new parameter to allow people that have aother arch than i386 - Without that for exemple amd64 packages list in FAI don't work git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14313 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 81c0618e4..4952f04a4 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -1,9 +1,9 @@ #!/usr/bin/perl #=============================================================================== # -# FILE: gosa-sd +# FILE: gosa-si-server # -# USAGE: ./gosa-sd +# USAGE: ./gosa-si-server # # DESCRIPTION: # @@ -94,7 +94,8 @@ our (%cfg_defaults, $log_file, $pid_file, $wake_on_lan_passwd, $job_synchronization, $modified_jobs_loop_delay, $arp_enabled, $arp_interface, $opsi_enabled, $opsi_server, $opsi_admin, $opsi_password, - $new_systems_ou, + $new_systems_ou, + $arch, ); # additional variable which should be globaly accessable @@ -195,7 +196,6 @@ our $packages_list_tn = "packages_list"; my $packages_list_file_name; our @packages_list_col_names = ("distribution VARCHAR(255)", "package VARCHAR(255)", "version VARCHAR(255)", "section VARCHAR(255)", "description TEXT", "template LONGBLOB", "timestamp VARCHAR(14)"); my $outdir = "/tmp/packages_list_db"; -my $arch = "i386"; # holds all messages which should be delivered to a user our $messaging_db; @@ -249,6 +249,7 @@ our $check_periodic = {"months"=>'', "weeks"=>'', "days"=>'', "hours"=>'', "minu "foreign-clients" => [\$foreign_clients_file_name, '/var/lib/gosa-si/foreign_clients.db'], "source-list" => [\$sources_list, '/etc/apt/sources.list'], "repo-path" => [\$repo_path, '/srv/www/repository'], + "debian-arch" => [\$arch, 'i386'], "ldap-uri" => [\$ldap_uri, ""], "ldap-base" => [\$ldap_base, ""], "ldap-admin-dn" => [\$ldap_admin_dn, ""], @@ -257,28 +258,28 @@ our $check_periodic = {"months"=>'', "weeks"=>'', "days"=>'', "hours"=>'', "minu "gosa-unit-tag" => [\$gosa_unit_tag, ""], "max-clients" => [\$max_clients, 10], "wol-password" => [\$wake_on_lan_passwd, ""], - "mysql-username" => [\$mysql_username, "gosa_si"], - "mysql-password" => [\$mysql_password, ""], - "mysql-database" => [\$mysql_database, "gosa_si"], - "mysql-host" => [\$mysql_host, "127.0.0.1"], + "mysql-username" => [\$mysql_username, "gosa_si"], + "mysql-password" => [\$mysql_password, ""], + "mysql-database" => [\$mysql_database, "gosa_si"], + "mysql-host" => [\$mysql_host, "127.0.0.1"], }, "GOsaPackages" => { "job-queue" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'], "job-queue-loop-delay" => [\$job_queue_loop_delay, 3], "messaging-db-loop-delay" => [\$messaging_db_loop_delay, 3], "key" => [\$GosaPackages_key, "none"], - "new-systems-ou" => [\$new_systems_ou, 'ou=workstations,ou=systems'], + "new-systems-ou" => [\$new_systems_ou, 'ou=workstations,ou=systems'], }, "ClientPackages" => { "key" => [\$ClientPackages_key, "none"], "user-date-of-expiry" => [\$logged_in_user_date_of_expiry, 600], }, "ServerPackages"=> { - "enabled" => [\$serverPackages_enabled, "true"], + "enabled" => [\$serverPackages_enabled, "true"], "address" => [\$foreign_server_string, ""], - "dns-lookup" => [\$dns_lookup, "true"], - "domain" => [\$server_domain, ""], - "key" => [\$ServerPackages_key, "none"], + "dns-lookup" => [\$dns_lookup, "true"], + "domain" => [\$server_domain, ""], + "key" => [\$ServerPackages_key, "none"], "key-lifetime" => [\$foreign_servers_register_delay, 120], "job-synchronization-enabled" => [\$job_synchronization, "true"], "synchronization-loop" => [\$modified_jobs_loop_delay, 5], diff --git a/gosa-si/gosa-si-server.conf.5 b/gosa-si/gosa-si-server.conf.5 index 06a582a3f..a598c4b8f 100644 --- a/gosa-si/gosa-si-server.conf.5 +++ b/gosa-si/gosa-si-server.conf.5 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "SERVER.CONF 1" -.TH SERVER.CONF 1 "2009-09-04" "perl v5.10.0" "User Contributed Perl Documentation" +.TH SERVER.CONF 1 "2009-09-22" "perl v5.10.0" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -186,6 +186,9 @@ Defines the location for the sources file. .IP "repo-path = /srv/www/repository" 4 .IX Item "repo-path = /srv/www/repository" Defines the location of the dak Archive or local Debian Mirror and is scanned for Debian Packages. +.IP "debian-arch = i386" 4 +.IX Item "debian-arch = i386" +Defines the architecture of the debian repository. .IP "ldap-uri =" 4 .IX Item "ldap-uri =" Defines the \s-1LDAP\s0 uniform resource identifier. diff --git a/gosa-si/server.conf.pod b/gosa-si/server.conf.pod index fd94ac56a..9570cf5a2 100644 --- a/gosa-si/server.conf.pod +++ b/gosa-si/server.conf.pod @@ -81,6 +81,10 @@ Defines the location for the sources file. Defines the location of the dak Archive or local Debian Mirror and is scanned for Debian Packages. +=item debian-arch = i386 + +Defines the architecture of the debian repository. + =item ldap-uri = Defines the LDAP uniform resource identifier.