diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/2010-November/000683.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2010-November/000683.html | 475 |
1 files changed, 475 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2010-November/000683.html b/zarb-ml/mageia-sysadm/2010-November/000683.html new file mode 100644 index 000000000..13d00add9 --- /dev/null +++ b/zarb-ml/mageia-sysadm/2010-November/000683.html @@ -0,0 +1,475 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master' + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B340%5D%20Merge%20remote%20branch%20%27vm_valstar/master%27&In-Reply-To=%3C20101120115254.DBD763FBCB%40valstar.mageia.org%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="000682.html"> + <LINK REL="Next" HREF="000684.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B340%5D%20Merge%20remote%20branch%20%27vm_valstar/master%27&In-Reply-To=%3C20101120115254.DBD763FBCB%40valstar.mageia.org%3E" + TITLE="[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'">root at mageia.org + </A><BR> + <I>Sat Nov 20 12:52:54 CET 2010</I> + <P><UL> + <LI>Previous message: <A HREF="000682.html">[Mageia-sysadm] [339] Merge remote branch 'vm_valstar/master' +</A></li> + <LI>Next message: <A HREF="000684.html">[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master' +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#683">[ date ]</a> + <a href="thread.html#683">[ thread ]</a> + <a href="subject.html#683">[ subject ]</a> + <a href="author.html#683">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Revision: 340 +Author: misc +Date: 2010-11-20 12:52:54 +0100 (Sat, 20 Nov 2010) +Log Message: +----------- +Merge remote branch 'vm_valstar/master' + +Modified Paths: +-------------- + puppet/modules/bugzilla/manifests/init.pp + puppet/modules/bugzilla/templates/params + puppet/modules/bugzilla/templates/webapp_bugzilla.conf + puppet/modules/catdap/manifests/init.pp + puppet/modules/catdap/templates/catdap_local.yml + puppet/modules/epoll/manifests/init.pp + puppet/modules/mga-mirrors/manifests/init.pp + puppet/modules/openldap/templates/slapd.conf + puppet/modules/openssh/manifests/init.pp + puppet/modules/pam/templates/ldap.conf + puppet/modules/postfix/templates/main.cf + puppet/modules/postfix/templates/simple_relay_main.cf + puppet/modules/restrictshell/templates/ldap-sshkey2file.py + puppet/modules/sympa/manifests/init.pp + puppet/modules/sympa/templates/auth.conf + puppet/modules/transifex/manifests/init.pp + puppet/modules/transifex/templates/20-engines.conf + +Added Paths: +----------- + puppet/modules/bugzilla/templates/vhost_bugs.conf + +Removed Paths: +------------- + puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf + +Modified: puppet/modules/bugzilla/manifests/init.pp +=================================================================== +--- 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", + } + } + + +Modified: puppet/modules/bugzilla/templates/params +=================================================================== +--- 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' => '<A HREF="http://bugs.mageia.org/">http://bugs.mageia.org/</A>', ++ 'urlbase' => '<A HREF="http://bugs.<%=">http://bugs.<%=</A> domain %>/', + 'use_mailer_queue' => 0, + 'use_see_also' => 1, + 'usebugaliases' => 0, + +Copied: puppet/modules/bugzilla/templates/vhost_bugs.conf (from rev 339, puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf) +=================================================================== +--- 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> + +Deleted: puppet/modules/bugzilla/templates/vhost_bugs.mageia.org.conf +=================================================================== +--- 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> + +Modified: puppet/modules/bugzilla/templates/webapp_bugzilla.conf +=================================================================== +--- 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> + +Modified: puppet/modules/catdap/manifests/init.pp +=================================================================== +--- 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] + } + +Modified: puppet/modules/catdap/templates/catdap_local.yml +=================================================================== +--- 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 + +Modified: puppet/modules/epoll/manifests/init.pp +=================================================================== +--- 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") + } + } + +Modified: puppet/modules/mga-mirrors/manifests/init.pp +=================================================================== +--- 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") + } + } + +Modified: puppet/modules/openldap/templates/slapd.conf +=================================================================== +--- 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 + +Modified: puppet/modules/openssh/manifests/init.pp +=================================================================== +--- 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 + } + +Modified: puppet/modules/pam/templates/ldap.conf +=================================================================== +--- 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 <A HREF="ldap://ldap.<%=">ldap://ldap.<%=</A> domain %> + base <%= dc_suffix %> + +Modified: puppet/modules/postfix/templates/main.cf +=================================================================== +--- 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 + +Modified: puppet/modules/postfix/templates/simple_relay_main.cf +=================================================================== +--- 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 + +Modified: puppet/modules/restrictshell/templates/ldap-sshkey2file.py +=================================================================== +--- 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=['<A HREF="ldap://ldap.<%=">ldap://ldap.<%=</A> domain %>'] + +Modified: puppet/modules/sympa/manifests/init.pp +=================================================================== +--- 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") + } + + +Modified: puppet/modules/sympa/templates/auth.conf +=================================================================== +--- 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 .* + + +Modified: puppet/modules/transifex/manifests/init.pp +=================================================================== +--- 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") + } + + +Modified: puppet/modules/transifex/templates/20-engines.conf +=================================================================== +--- 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) +-------------- next part -------------- +An HTML attachment was scrubbed... +URL: </pipermail/mageia-sysadm/attachments/20101120/825456eb/attachment-0001.html> +</PRE> + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="000682.html">[Mageia-sysadm] [339] Merge remote branch 'vm_valstar/master' +</A></li> + <LI>Next message: <A HREF="000684.html">[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master' +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#683">[ date ]</a> + <a href="thread.html#683">[ thread ]</a> + <a href="subject.html#683">[ subject ]</a> + <a href="author.html#683">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm +mailing list</a><br> +</body></html> |