diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101120/825456eb')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101120/825456eb/attachment-0001.html | 468 | ||||
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101120/825456eb/attachment.html | 468 |
2 files changed, 936 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101120/825456eb/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101120/825456eb/attachment-0001.html new file mode 100644 index 000000000..73544450a --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101120/825456eb/attachment-0001.html @@ -0,0 +1,468 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[340] Merge remote branch 'vm_valstar/master'</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>340</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-11-20 12:52:54 +0100 (Sat, 20 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Merge remote branch 'vm_valstar/master'</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillamanifestsinitpp">puppet/modules/bugzilla/manifests/init.pp</a></li> +<li><a href="#puppetmodulesbugzillatemplatesparams">puppet/modules/bugzilla/templates/params</a></li> +<li><a href="#puppetmodulesbugzillatemplateswebapp_bugzillaconf">puppet/modules/bugzilla/templates/webapp_bugzilla.conf</a></li> +<li><a href="#puppetmodulescatdapmanifestsinitpp">puppet/modules/catdap/manifests/init.pp</a></li> +<li><a href="#puppetmodulescatdaptemplatescatdap_localyml">puppet/modules/catdap/templates/catdap_local.yml</a></li> +<li><a href="#puppetmodulesepollmanifestsinitpp">puppet/modules/epoll/manifests/init.pp</a></li> +<li><a href="#puppetmodulesmgamirrorsmanifestsinitpp">puppet/modules/mga-mirrors/manifests/init.pp</a></li> +<li><a href="#puppetmodulesopenldaptemplatesslapdconf">puppet/modules/openldap/templates/slapd.conf</a></li> +<li><a href="#puppetmodulesopensshmanifestsinitpp">puppet/modules/openssh/manifests/init.pp</a></li> +<li><a href="#puppetmodulespamtemplatesldapconf">puppet/modules/pam/templates/ldap.conf</a></li> +<li><a href="#puppetmodulespostfixtemplatesmaincf">puppet/modules/postfix/templates/main.cf</a></li> +<li><a href="#puppetmodulespostfixtemplatessimple_relay_maincf">puppet/modules/postfix/templates/simple_relay_main.cf</a></li> +<li><a href="#puppetmodulesrestrictshelltemplatesldapsshkey2filepy">puppet/modules/restrictshell/templates/ldap-sshkey2file.py</a></li> +<li><a href="#puppetmodulessympamanifestsinitpp">puppet/modules/sympa/manifests/init.pp</a></li> +<li><a href="#puppetmodulessympatemplatesauthconf">puppet/modules/sympa/templates/auth.conf</a></li> +<li><a href="#puppetmodulestransifexmanifestsinitpp">puppet/modules/transifex/manifests/init.pp</a></li> +<li><a href="#puppetmodulestransifextemplates20enginesconf">puppet/modules/transifex/templates/20-engines.conf</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillatemplatesvhost_bugsconf">puppet/modules/bugzilla/templates/vhost_bugs.conf</a></li> +</ul> + +<h3>Removed Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillatemplatesvhost_bugsmageiaorgconf">puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbugzillamanifestsinitpp">Modified: puppet/modules/bugzilla/manifests/init.pp</a> +=================================================================== +--- puppet/modules/bugzilla/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/bugzilla/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -10,8 +10,8 @@ + file { '/etc/bugzilla/localconfig': + ensure => present, + owner => root, +- group => root, +- mode => 644, ++ group => apache, ++ mode => 640, + content => template("bugzilla/localconfig") + } + +@@ -19,8 +19,8 @@ + file { '/var/lib/bugzilla/params': + ensure => present, + owner => root, +- group => root, +- mode => 644, ++ group => apache, ++ mode => 640, + content => template("bugzilla/params") + } + +@@ -30,7 +30,7 @@ + } + + apache::vhost_other_app { "bugs.$domain": +- vhost_file => "bugzilla/vhost_bugs.mageia.org.conf", ++ vhost_file => "bugzilla/vhost_bugs.conf", + } + } + + +<a id="puppetmodulesbugzillatemplatesparams">Modified: puppet/modules/bugzilla/templates/params</a> +=================================================================== +--- puppet/modules/bugzilla/templates/params 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/bugzilla/templates/params 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,9 +1,9 @@ + %param = ( +- 'LDAPBaseDN' => 'ou=People,dc=mageia,dc=org', +- 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,dc=mageia,dc=org:<%= passwordLdap %>', ++ 'LDAPBaseDN' => 'ou=People,<%= dc_suffix %>', ++ 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,<%= dc_suffix %>:<%= passwordLdap %>', + 'LDAPfilter' => '', + 'LDAPmailattribute' => 'mail', +- 'LDAPserver' => 'ldap.mageia.org', ++ 'LDAPserver' => 'ldap.<%= domain %>', + 'LDAPstarttls' => '1', + 'LDAPuidattribute' => 'uid', + 'RADIUS_NAS_IP' => '', +@@ -88,7 +88,7 @@ + 'strict_isolation' => 0, + 'timetrackinggroup' => 'editbugs', + 'upgrade_notification' => 'latest_stable_release', +- 'urlbase' => 'http://bugs.mageia.org/', ++ 'urlbase' => 'http://bugs.<%= domain %>/', + 'use_mailer_queue' => 0, + 'use_see_also' => 1, + 'usebugaliases' => 0, + +<a id="puppetmodulesbugzillatemplatesvhost_bugsconffromrev339puppetmodulesbugzillatemplatesvhost_bugsmageiaorgconf">Copied: puppet/modules/bugzilla/templates/vhost_bugs.conf (from rev 339, puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf)</a> +=================================================================== +--- puppet/modules/bugzilla/templates/vhost_bugs.conf (rev 0) ++++ puppet/modules/bugzilla/templates/vhost_bugs.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -0,0 +1,13 @@ ++<% ++path_data_directory = lib_dir + "/bugzilla" ++%> ++ ++<VirtualHost *:80> ++ ServerName bugs.<%= domain %> ++ DocumentRoot /usr/share/bugzilla/www ++ Alias /bugzilla/data <%= path_data_directory %> ++ Alias /bugzilla /usr/share/bugzilla/www ++ <Location /> ++ Allow from all ++ </Location> ++</VirtualHost> + +<a id="puppetmodulesbugzillatemplatesvhost_bugsmageiaorgconf">Deleted: puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf</a> +=================================================================== +--- puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,13 +0,0 @@ +-<% +-path_data_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/bugzilla" +-%> +- +-<VirtualHost *:80> +- ServerName bugs.<%= domain %> +- DocumentRoot /usr/share/bugzilla/www +- Alias /bugzilla/data <%= path_data_directory %> +- Alias /bugzilla /usr/share/bugzilla/www +- <Location /> +- Allow from all +- </Location> +-</VirtualHost> + +<a id="puppetmodulesbugzillatemplateswebapp_bugzillaconf">Modified: puppet/modules/bugzilla/templates/webapp_bugzilla.conf</a> +=================================================================== +--- puppet/modules/bugzilla/templates/webapp_bugzilla.conf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/bugzilla/templates/webapp_bugzilla.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,5 +1,5 @@ + <% +-path_data_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/bugzilla" ++path_data_directory = lib_dir + "/bugzilla" + %> + + <Directory /usr/share/bugzilla/www> + +<a id="puppetmodulescatdapmanifestsinitpp">Modified: puppet/modules/catdap/manifests/init.pp</a> +=================================================================== +--- puppet/modules/catdap/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/catdap/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -25,8 +25,9 @@ + + file { "$catdap_location/catdap_local.yml": + ensure => present, +- owner => apache, +- mode => 600, ++ owner => root, ++ group => apache, ++ mode => 640, + content => template("catdap/catdap_local.yml"), + require => Subversion::Snapshot[$catdap_location] + } + +<a id="puppetmodulescatdaptemplatescatdap_localyml">Modified: puppet/modules/catdap/templates/catdap_local.yml</a> +=================================================================== +--- puppet/modules/catdap/templates/catdap_local.yml 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/catdap/templates/catdap_local.yml 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,8 +1,4 @@ + <% +-# domain come from facter +- +-dc_suffix = 'dc=' + domain.gsub('.',',dc=') +- + ldap_server = 'ldap.' + domain + + ldap_password = catdap_password + +<a id="puppetmodulesepollmanifestsinitpp">Modified: puppet/modules/epoll/manifests/init.pp</a> +=================================================================== +--- puppet/modules/epoll/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/epoll/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -15,9 +15,9 @@ + file { "epoll.yml": + path => "/etc/epoll.yml", + ensure => "present", +- owner => apache, ++ owner => root, + group => apache, +- mode => 600, ++ mode => 640, + content => template("epoll/epoll.yml") + } + } + +<a id="puppetmodulesmgamirrorsmanifestsinitpp">Modified: puppet/modules/mga-mirrors/manifests/init.pp</a> +=================================================================== +--- puppet/modules/mga-mirrors/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/mga-mirrors/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -15,9 +15,9 @@ + file { "mga-mirrors.ini": + path => "/etc/mga-mirrors.ini", + ensure => "present", +- owner => apache, ++ owner => root, + group => apache, +- mode => 600, ++ mode => 640, + content => template("mga-mirrors/mga-mirrors.ini") + } + } + +<a id="puppetmodulesopenldaptemplatesslapdconf">Modified: puppet/modules/openldap/templates/slapd.conf</a> +=================================================================== +--- puppet/modules/openldap/templates/slapd.conf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/openldap/templates/slapd.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,9 +1,3 @@ +-<% +-dc_suffix = 'dc=' + domain.gsub('.',',dc=') +-path_module_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/openldap" +- +-%> +- + # slapd.conf template + include /usr/share/openldap/schema/core.schema + include /usr/share/openldap/schema/cosine.schema +@@ -32,7 +26,7 @@ + pidfile /var/run/ldap/slapd.pid + argsfile /var/run/ldap/slapd.args + +-modulepath <%= path_module_directory %> ++modulepath <%= lib_dir %>/openldap + moduleload back_monitor.la + moduleload syncprov.la + moduleload ppolicy.la + +<a id="puppetmodulesopensshmanifestsinitpp">Modified: puppet/modules/openssh/manifests/init.pp</a> +=================================================================== +--- puppet/modules/openssh/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/openssh/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,13 +1,8 @@ + class openssh { + + # some trick to manage sftp server, who is arch dependent on mdv +- $usr_lib = $architecture ? { +- x86_64 => "lib64", +- default => "lib" +- } ++ $path_to_sftp = "$lib_dir/ssh/" + +- $path_to_sftp = "/usr/$usr_lib/ssh/" +- + package { "openssh-server": + ensure => installed + } + +<a id="puppetmodulespamtemplatesldapconf">Modified: puppet/modules/pam/templates/ldap.conf</a> +=================================================================== +--- puppet/modules/pam/templates/ldap.conf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/pam/templates/ldap.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,6 +1,3 @@ +-<% +-dc_suffix = 'dc=' + domain.gsub('.',',dc=') +-%> + + uri ldap://ldap.<%= domain %> + base <%= dc_suffix %> + +<a id="puppetmodulespostfixtemplatesmaincf">Modified: puppet/modules/postfix/templates/main.cf</a> +=================================================================== +--- puppet/modules/postfix/templates/main.cf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/postfix/templates/main.cf 2010-11-20 11:52:54 UTC (rev 340) +@@ -3,9 +3,6 @@ + # This file contains only the parameters changed from a default install + # see /etc/postfix/main.cf.dist for a commented, fuller version of this file. + +-<% +-path_daemon_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/postfix/" +-%> + + # These are changed by postfix install script + readme_directory = /usr/share/doc/postfix/README_FILES +@@ -14,7 +11,7 @@ + setgid_group = postdrop + command_directory = /usr/sbin + manpage_directory = /usr/share/man +-daemon_directory = <%= path_daemon_directory %> ++daemon_directory = <%= lib_dir %>/postfix/ + data_directory = /var/lib/postfix + newaliases_path = /usr/bin/newaliases + mailq_path = /usr/bin/mailq + +<a id="puppetmodulespostfixtemplatessimple_relay_maincf">Modified: puppet/modules/postfix/templates/simple_relay_main.cf</a> +=================================================================== +--- puppet/modules/postfix/templates/simple_relay_main.cf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/postfix/templates/simple_relay_main.cf 2010-11-20 11:52:54 UTC (rev 340) +@@ -3,9 +3,6 @@ + # This file contains only the parameters changed from a default install + # see /etc/postfix/main.cf.dist for a commented, fuller version of this file. + +-<% +-path_daemon_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/postfix/" +-%> + + # These are changed by postfix install script + readme_directory = /usr/share/doc/postfix/README_FILES +@@ -14,7 +11,7 @@ + setgid_group = postdrop + command_directory = /usr/sbin + manpage_directory = /usr/share/man +-daemon_directory = <%= path_daemon_directory %> ++daemon_directory = <%= lib_dir %>/postfix/ + data_directory = /var/lib/postfix + newaliases_path = /usr/bin/newaliases + mailq_path = /usr/bin/mailq + +<a id="puppetmodulesrestrictshelltemplatesldapsshkey2filepy">Modified: puppet/modules/restrictshell/templates/ldap-sshkey2file.py</a> +=================================================================== +--- puppet/modules/restrictshell/templates/ldap-sshkey2file.py 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/restrictshell/templates/ldap-sshkey2file.py 2010-11-20 11:52:54 UTC (rev 340) +@@ -9,9 +9,7 @@ + except ImportError, e: + print "Please install python-ldap before running this program" + sys.exit(1) +-<% +-dc_suffix = 'dc=' + domain.gsub('.',',dc=') +-%> ++ + basedn="<%= dc_suffix %>" + peopledn="ou=people,%s" % basedn + uris=['ldap://ldap.<%= domain %>'] + +<a id="puppetmodulessympamanifestsinitpp">Modified: puppet/modules/sympa/manifests/init.pp</a> +=================================================================== +--- puppet/modules/sympa/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/sympa/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -11,9 +11,11 @@ + + file { '/etc/sympa/sympa.conf': + ensure => present, +- owner => root, +- group => root, +- mode => 644, ++ # should be cleaner to have it root owned, but puppet do not support acl ++ # and in any case, config will be reset if it change ++ owner => sympa, ++ group => apache, ++ mode => 640, + content => template("sympa/sympa.conf") + } + + +<a id="puppetmodulessympatemplatesauthconf">Modified: puppet/modules/sympa/templates/auth.conf</a> +=================================================================== +--- puppet/modules/sympa/templates/auth.conf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/sympa/templates/auth.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,13 +1,13 @@ + ldap +- host ldap.mageia.org:389 ++ host ldap.<%= domain %>:389 + timeout 30 +- suffix dc=mageia,dc=org ++ suffix <%= dc_suffix %> + get_dn_by_uid_filter (uid=[sender]) + get_dn_by_email (|(mail=[sender])(mailalternateaddress=[sender])) + email_attribute mail + scope sub ++ use_ssl 1 + +- + user_table + regexp .* + + +<a id="puppetmodulestransifexmanifestsinitpp">Modified: puppet/modules/transifex/manifests/init.pp</a> +=================================================================== +--- puppet/modules/transifex/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/transifex/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -8,8 +8,8 @@ + path => "/etc/transifex/20-engines.conf", + ensure => present, + owner => root, +- group => root, +- mode => 755, ++ group => apache, ++ mode => 640, + content => template("transifex/20-engines.conf") + } + +@@ -18,7 +18,7 @@ + ensure => present, + owner => root, + group => root, +- mode => 755, ++ mode => 644, + content => template("transifex/30-site.conf") + } + + +<a id="puppetmodulestransifextemplates20enginesconf">Modified: puppet/modules/transifex/templates/20-engines.conf</a> +=================================================================== +--- puppet/modules/transifex/templates/20-engines.conf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/transifex/templates/20-engines.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -10,7 +10,7 @@ + # The following are not used for sqlite3 + DATABASE_USER = 'transifex' + DATABASE_PASSWORD = '<%= password %>' +-DATABASE_HOST = 'pgsql.mageia.org' # Set to empty string for local socket ++DATABASE_HOST = 'pgsql.<%= domain %>' # Set to empty string for local socket + DATABASE_PORT = '' # Set to empty string for default + + ## Caching (optional) + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101120/825456eb/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101120/825456eb/attachment.html new file mode 100644 index 000000000..73544450a --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101120/825456eb/attachment.html @@ -0,0 +1,468 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[340] Merge remote branch 'vm_valstar/master'</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>340</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-11-20 12:52:54 +0100 (Sat, 20 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Merge remote branch 'vm_valstar/master'</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillamanifestsinitpp">puppet/modules/bugzilla/manifests/init.pp</a></li> +<li><a href="#puppetmodulesbugzillatemplatesparams">puppet/modules/bugzilla/templates/params</a></li> +<li><a href="#puppetmodulesbugzillatemplateswebapp_bugzillaconf">puppet/modules/bugzilla/templates/webapp_bugzilla.conf</a></li> +<li><a href="#puppetmodulescatdapmanifestsinitpp">puppet/modules/catdap/manifests/init.pp</a></li> +<li><a href="#puppetmodulescatdaptemplatescatdap_localyml">puppet/modules/catdap/templates/catdap_local.yml</a></li> +<li><a href="#puppetmodulesepollmanifestsinitpp">puppet/modules/epoll/manifests/init.pp</a></li> +<li><a href="#puppetmodulesmgamirrorsmanifestsinitpp">puppet/modules/mga-mirrors/manifests/init.pp</a></li> +<li><a href="#puppetmodulesopenldaptemplatesslapdconf">puppet/modules/openldap/templates/slapd.conf</a></li> +<li><a href="#puppetmodulesopensshmanifestsinitpp">puppet/modules/openssh/manifests/init.pp</a></li> +<li><a href="#puppetmodulespamtemplatesldapconf">puppet/modules/pam/templates/ldap.conf</a></li> +<li><a href="#puppetmodulespostfixtemplatesmaincf">puppet/modules/postfix/templates/main.cf</a></li> +<li><a href="#puppetmodulespostfixtemplatessimple_relay_maincf">puppet/modules/postfix/templates/simple_relay_main.cf</a></li> +<li><a href="#puppetmodulesrestrictshelltemplatesldapsshkey2filepy">puppet/modules/restrictshell/templates/ldap-sshkey2file.py</a></li> +<li><a href="#puppetmodulessympamanifestsinitpp">puppet/modules/sympa/manifests/init.pp</a></li> +<li><a href="#puppetmodulessympatemplatesauthconf">puppet/modules/sympa/templates/auth.conf</a></li> +<li><a href="#puppetmodulestransifexmanifestsinitpp">puppet/modules/transifex/manifests/init.pp</a></li> +<li><a href="#puppetmodulestransifextemplates20enginesconf">puppet/modules/transifex/templates/20-engines.conf</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillatemplatesvhost_bugsconf">puppet/modules/bugzilla/templates/vhost_bugs.conf</a></li> +</ul> + +<h3>Removed Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillatemplatesvhost_bugsmageiaorgconf">puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbugzillamanifestsinitpp">Modified: puppet/modules/bugzilla/manifests/init.pp</a> +=================================================================== +--- puppet/modules/bugzilla/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/bugzilla/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -10,8 +10,8 @@ + file { '/etc/bugzilla/localconfig': + ensure => present, + owner => root, +- group => root, +- mode => 644, ++ group => apache, ++ mode => 640, + content => template("bugzilla/localconfig") + } + +@@ -19,8 +19,8 @@ + file { '/var/lib/bugzilla/params': + ensure => present, + owner => root, +- group => root, +- mode => 644, ++ group => apache, ++ mode => 640, + content => template("bugzilla/params") + } + +@@ -30,7 +30,7 @@ + } + + apache::vhost_other_app { "bugs.$domain": +- vhost_file => "bugzilla/vhost_bugs.mageia.org.conf", ++ vhost_file => "bugzilla/vhost_bugs.conf", + } + } + + +<a id="puppetmodulesbugzillatemplatesparams">Modified: puppet/modules/bugzilla/templates/params</a> +=================================================================== +--- puppet/modules/bugzilla/templates/params 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/bugzilla/templates/params 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,9 +1,9 @@ + %param = ( +- 'LDAPBaseDN' => 'ou=People,dc=mageia,dc=org', +- 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,dc=mageia,dc=org:<%= passwordLdap %>', ++ 'LDAPBaseDN' => 'ou=People,<%= dc_suffix %>', ++ 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,<%= dc_suffix %>:<%= passwordLdap %>', + 'LDAPfilter' => '', + 'LDAPmailattribute' => 'mail', +- 'LDAPserver' => 'ldap.mageia.org', ++ 'LDAPserver' => 'ldap.<%= domain %>', + 'LDAPstarttls' => '1', + 'LDAPuidattribute' => 'uid', + 'RADIUS_NAS_IP' => '', +@@ -88,7 +88,7 @@ + 'strict_isolation' => 0, + 'timetrackinggroup' => 'editbugs', + 'upgrade_notification' => 'latest_stable_release', +- 'urlbase' => 'http://bugs.mageia.org/', ++ 'urlbase' => 'http://bugs.<%= domain %>/', + 'use_mailer_queue' => 0, + 'use_see_also' => 1, + 'usebugaliases' => 0, + +<a id="puppetmodulesbugzillatemplatesvhost_bugsconffromrev339puppetmodulesbugzillatemplatesvhost_bugsmageiaorgconf">Copied: puppet/modules/bugzilla/templates/vhost_bugs.conf (from rev 339, puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf)</a> +=================================================================== +--- puppet/modules/bugzilla/templates/vhost_bugs.conf (rev 0) ++++ puppet/modules/bugzilla/templates/vhost_bugs.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -0,0 +1,13 @@ ++<% ++path_data_directory = lib_dir + "/bugzilla" ++%> ++ ++<VirtualHost *:80> ++ ServerName bugs.<%= domain %> ++ DocumentRoot /usr/share/bugzilla/www ++ Alias /bugzilla/data <%= path_data_directory %> ++ Alias /bugzilla /usr/share/bugzilla/www ++ <Location /> ++ Allow from all ++ </Location> ++</VirtualHost> + +<a id="puppetmodulesbugzillatemplatesvhost_bugsmageiaorgconf">Deleted: puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf</a> +=================================================================== +--- puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,13 +0,0 @@ +-<% +-path_data_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/bugzilla" +-%> +- +-<VirtualHost *:80> +- ServerName bugs.<%= domain %> +- DocumentRoot /usr/share/bugzilla/www +- Alias /bugzilla/data <%= path_data_directory %> +- Alias /bugzilla /usr/share/bugzilla/www +- <Location /> +- Allow from all +- </Location> +-</VirtualHost> + +<a id="puppetmodulesbugzillatemplateswebapp_bugzillaconf">Modified: puppet/modules/bugzilla/templates/webapp_bugzilla.conf</a> +=================================================================== +--- puppet/modules/bugzilla/templates/webapp_bugzilla.conf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/bugzilla/templates/webapp_bugzilla.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,5 +1,5 @@ + <% +-path_data_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/bugzilla" ++path_data_directory = lib_dir + "/bugzilla" + %> + + <Directory /usr/share/bugzilla/www> + +<a id="puppetmodulescatdapmanifestsinitpp">Modified: puppet/modules/catdap/manifests/init.pp</a> +=================================================================== +--- puppet/modules/catdap/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/catdap/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -25,8 +25,9 @@ + + file { "$catdap_location/catdap_local.yml": + ensure => present, +- owner => apache, +- mode => 600, ++ owner => root, ++ group => apache, ++ mode => 640, + content => template("catdap/catdap_local.yml"), + require => Subversion::Snapshot[$catdap_location] + } + +<a id="puppetmodulescatdaptemplatescatdap_localyml">Modified: puppet/modules/catdap/templates/catdap_local.yml</a> +=================================================================== +--- puppet/modules/catdap/templates/catdap_local.yml 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/catdap/templates/catdap_local.yml 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,8 +1,4 @@ + <% +-# domain come from facter +- +-dc_suffix = 'dc=' + domain.gsub('.',',dc=') +- + ldap_server = 'ldap.' + domain + + ldap_password = catdap_password + +<a id="puppetmodulesepollmanifestsinitpp">Modified: puppet/modules/epoll/manifests/init.pp</a> +=================================================================== +--- puppet/modules/epoll/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/epoll/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -15,9 +15,9 @@ + file { "epoll.yml": + path => "/etc/epoll.yml", + ensure => "present", +- owner => apache, ++ owner => root, + group => apache, +- mode => 600, ++ mode => 640, + content => template("epoll/epoll.yml") + } + } + +<a id="puppetmodulesmgamirrorsmanifestsinitpp">Modified: puppet/modules/mga-mirrors/manifests/init.pp</a> +=================================================================== +--- puppet/modules/mga-mirrors/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/mga-mirrors/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -15,9 +15,9 @@ + file { "mga-mirrors.ini": + path => "/etc/mga-mirrors.ini", + ensure => "present", +- owner => apache, ++ owner => root, + group => apache, +- mode => 600, ++ mode => 640, + content => template("mga-mirrors/mga-mirrors.ini") + } + } + +<a id="puppetmodulesopenldaptemplatesslapdconf">Modified: puppet/modules/openldap/templates/slapd.conf</a> +=================================================================== +--- puppet/modules/openldap/templates/slapd.conf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/openldap/templates/slapd.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,9 +1,3 @@ +-<% +-dc_suffix = 'dc=' + domain.gsub('.',',dc=') +-path_module_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/openldap" +- +-%> +- + # slapd.conf template + include /usr/share/openldap/schema/core.schema + include /usr/share/openldap/schema/cosine.schema +@@ -32,7 +26,7 @@ + pidfile /var/run/ldap/slapd.pid + argsfile /var/run/ldap/slapd.args + +-modulepath <%= path_module_directory %> ++modulepath <%= lib_dir %>/openldap + moduleload back_monitor.la + moduleload syncprov.la + moduleload ppolicy.la + +<a id="puppetmodulesopensshmanifestsinitpp">Modified: puppet/modules/openssh/manifests/init.pp</a> +=================================================================== +--- puppet/modules/openssh/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/openssh/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,13 +1,8 @@ + class openssh { + + # some trick to manage sftp server, who is arch dependent on mdv +- $usr_lib = $architecture ? { +- x86_64 => "lib64", +- default => "lib" +- } ++ $path_to_sftp = "$lib_dir/ssh/" + +- $path_to_sftp = "/usr/$usr_lib/ssh/" +- + package { "openssh-server": + ensure => installed + } + +<a id="puppetmodulespamtemplatesldapconf">Modified: puppet/modules/pam/templates/ldap.conf</a> +=================================================================== +--- puppet/modules/pam/templates/ldap.conf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/pam/templates/ldap.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,6 +1,3 @@ +-<% +-dc_suffix = 'dc=' + domain.gsub('.',',dc=') +-%> + + uri ldap://ldap.<%= domain %> + base <%= dc_suffix %> + +<a id="puppetmodulespostfixtemplatesmaincf">Modified: puppet/modules/postfix/templates/main.cf</a> +=================================================================== +--- puppet/modules/postfix/templates/main.cf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/postfix/templates/main.cf 2010-11-20 11:52:54 UTC (rev 340) +@@ -3,9 +3,6 @@ + # This file contains only the parameters changed from a default install + # see /etc/postfix/main.cf.dist for a commented, fuller version of this file. + +-<% +-path_daemon_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/postfix/" +-%> + + # These are changed by postfix install script + readme_directory = /usr/share/doc/postfix/README_FILES +@@ -14,7 +11,7 @@ + setgid_group = postdrop + command_directory = /usr/sbin + manpage_directory = /usr/share/man +-daemon_directory = <%= path_daemon_directory %> ++daemon_directory = <%= lib_dir %>/postfix/ + data_directory = /var/lib/postfix + newaliases_path = /usr/bin/newaliases + mailq_path = /usr/bin/mailq + +<a id="puppetmodulespostfixtemplatessimple_relay_maincf">Modified: puppet/modules/postfix/templates/simple_relay_main.cf</a> +=================================================================== +--- puppet/modules/postfix/templates/simple_relay_main.cf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/postfix/templates/simple_relay_main.cf 2010-11-20 11:52:54 UTC (rev 340) +@@ -3,9 +3,6 @@ + # This file contains only the parameters changed from a default install + # see /etc/postfix/main.cf.dist for a commented, fuller version of this file. + +-<% +-path_daemon_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/postfix/" +-%> + + # These are changed by postfix install script + readme_directory = /usr/share/doc/postfix/README_FILES +@@ -14,7 +11,7 @@ + setgid_group = postdrop + command_directory = /usr/sbin + manpage_directory = /usr/share/man +-daemon_directory = <%= path_daemon_directory %> ++daemon_directory = <%= lib_dir %>/postfix/ + data_directory = /var/lib/postfix + newaliases_path = /usr/bin/newaliases + mailq_path = /usr/bin/mailq + +<a id="puppetmodulesrestrictshelltemplatesldapsshkey2filepy">Modified: puppet/modules/restrictshell/templates/ldap-sshkey2file.py</a> +=================================================================== +--- puppet/modules/restrictshell/templates/ldap-sshkey2file.py 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/restrictshell/templates/ldap-sshkey2file.py 2010-11-20 11:52:54 UTC (rev 340) +@@ -9,9 +9,7 @@ + except ImportError, e: + print "Please install python-ldap before running this program" + sys.exit(1) +-<% +-dc_suffix = 'dc=' + domain.gsub('.',',dc=') +-%> ++ + basedn="<%= dc_suffix %>" + peopledn="ou=people,%s" % basedn + uris=['ldap://ldap.<%= domain %>'] + +<a id="puppetmodulessympamanifestsinitpp">Modified: puppet/modules/sympa/manifests/init.pp</a> +=================================================================== +--- puppet/modules/sympa/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/sympa/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -11,9 +11,11 @@ + + file { '/etc/sympa/sympa.conf': + ensure => present, +- owner => root, +- group => root, +- mode => 644, ++ # should be cleaner to have it root owned, but puppet do not support acl ++ # and in any case, config will be reset if it change ++ owner => sympa, ++ group => apache, ++ mode => 640, + content => template("sympa/sympa.conf") + } + + +<a id="puppetmodulessympatemplatesauthconf">Modified: puppet/modules/sympa/templates/auth.conf</a> +=================================================================== +--- puppet/modules/sympa/templates/auth.conf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/sympa/templates/auth.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -1,13 +1,13 @@ + ldap +- host ldap.mageia.org:389 ++ host ldap.<%= domain %>:389 + timeout 30 +- suffix dc=mageia,dc=org ++ suffix <%= dc_suffix %> + get_dn_by_uid_filter (uid=[sender]) + get_dn_by_email (|(mail=[sender])(mailalternateaddress=[sender])) + email_attribute mail + scope sub ++ use_ssl 1 + +- + user_table + regexp .* + + +<a id="puppetmodulestransifexmanifestsinitpp">Modified: puppet/modules/transifex/manifests/init.pp</a> +=================================================================== +--- puppet/modules/transifex/manifests/init.pp 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/transifex/manifests/init.pp 2010-11-20 11:52:54 UTC (rev 340) +@@ -8,8 +8,8 @@ + path => "/etc/transifex/20-engines.conf", + ensure => present, + owner => root, +- group => root, +- mode => 755, ++ group => apache, ++ mode => 640, + content => template("transifex/20-engines.conf") + } + +@@ -18,7 +18,7 @@ + ensure => present, + owner => root, + group => root, +- mode => 755, ++ mode => 644, + content => template("transifex/30-site.conf") + } + + +<a id="puppetmodulestransifextemplates20enginesconf">Modified: puppet/modules/transifex/templates/20-engines.conf</a> +=================================================================== +--- puppet/modules/transifex/templates/20-engines.conf 2010-11-20 11:15:06 UTC (rev 339) ++++ puppet/modules/transifex/templates/20-engines.conf 2010-11-20 11:52:54 UTC (rev 340) +@@ -10,7 +10,7 @@ + # The following are not used for sqlite3 + DATABASE_USER = 'transifex' + DATABASE_PASSWORD = '<%= password %>' +-DATABASE_HOST = 'pgsql.mageia.org' # Set to empty string for local socket ++DATABASE_HOST = 'pgsql.<%= domain %>' # Set to empty string for local socket + DATABASE_PORT = '' # Set to empty string for default + + ## Caching (optional) + +</pre></div> + +</body> +</html>
\ No newline at end of file |