diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/2010-November/000343.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2010-November/000343.html | 134 |
1 files changed, 134 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2010-November/000343.html b/zarb-ml/mageia-sysadm/2010-November/000343.html new file mode 100644 index 000000000..e64809d4d --- /dev/null +++ b/zarb-ml/mageia-sysadm/2010-November/000343.html @@ -0,0 +1,134 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [203] - remove uneeded include, and remove the old config file + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B203%5D%20-%20remove%20uneeded%20include%2C%0A%09and%20remove%20the%20old%20config%20file&In-Reply-To=%3C20101108014708.C90C93FC10%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="000341.html"> + <LINK REL="Next" HREF="000344.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [203] - remove uneeded include, and remove the old config file</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B203%5D%20-%20remove%20uneeded%20include%2C%0A%09and%20remove%20the%20old%20config%20file&In-Reply-To=%3C20101108014708.C90C93FC10%40valstar.mageia.org%3E" + TITLE="[Mageia-sysadm] [203] - remove uneeded include, and remove the old config file">root at mageia.org + </A><BR> + <I>Mon Nov 8 02:47:08 CET 2010</I> + <P><UL> + <LI>Previous message: <A HREF="000341.html">[Mageia-sysadm] [202] - deploy the tagmail configuration file, so we get error on manifest application +</A></li> + <LI>Next message: <A HREF="000344.html">[Mageia-sysadm] [204] - fix manifests +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#343">[ date ]</a> + <a href="thread.html#343">[ thread ]</a> + <a href="subject.html#343">[ subject ]</a> + <a href="author.html#343">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Revision: 203 +Author: misc +Date: 2010-11-08 02:47:08 +0100 (Mon, 08 Nov 2010) +Log Message: +----------- +- remove uneeded include, and remove the old config file + +Modified Paths: +-------------- + puppet/modules/catdap/manifests/init.pp + +Removed Paths: +------------- + puppet/modules/catdap/templates/catdap_vhost.conf + +Modified: puppet/modules/catdap/manifests/init.pp +=================================================================== +--- puppet/modules/catdap/manifests/init.pp 2010-11-08 01:16:10 UTC (rev 202) ++++ puppet/modules/catdap/manifests/init.pp 2010-11-08 01:47:08 UTC (rev 203) +@@ -1,9 +1,5 @@ + class catdap { + +- include subversion +- include subversion::client +- include apache::mod_fcgid +- + $catdap_location = "/var/www/identity" + $catdap_vhost = "identity.$domain" + +@@ -42,15 +38,4 @@ + } + + apache::vhost_redirect_ssl { $catdap_vhost: } +- +- # add a apache vhost +-# file { "$catdap_vhost.conf": +-# path => "/etc/httpd/conf/vhosts.d/$catdap_vhost.conf", +-# ensure => "present", +-# owner => root, +-# group => root, +-# mode => 644, +-# notify => Service['apache'], +-# content => template("catdap/catdap_vhost.conf") +-# } + } + +Deleted: puppet/modules/catdap/templates/catdap_vhost.conf +=================================================================== +--- puppet/modules/catdap/templates/catdap_vhost.conf 2010-11-08 01:16:10 UTC (rev 202) ++++ puppet/modules/catdap/templates/catdap_vhost.conf 2010-11-08 01:47:08 UTC (rev 203) +@@ -1,15 +0,0 @@ +-<VirtualHost *:80> +- ServerName <%= catdap_vhost %> +- # Serve static content directly +- DocumentRoot <%= catdap_location %>/root +- Alias /static <%= catdap_location %>/root/static +- +- Alias / <%= catdap_location %>/script/catdap_fastcgi.pl/ +- +- <Directory <%= catdap_location %>/script> +- Options +ExecCGI +- SetHandler fcgid-script +- Allow from all +- </Directory> +-</VirtualHost> +- +-------------- next part -------------- +An HTML attachment was scrubbed... +URL: </pipermail/mageia-sysadm/attachments/20101108/4d4ccdba/attachment.html> +</PRE> + + + + + + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="000341.html">[Mageia-sysadm] [202] - deploy the tagmail configuration file, so we get error on manifest application +</A></li> + <LI>Next message: <A HREF="000344.html">[Mageia-sysadm] [204] - fix manifests +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#343">[ date ]</a> + <a href="thread.html#343">[ thread ]</a> + <a href="subject.html#343">[ subject ]</a> + <a href="author.html#343">[ 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> |