[Webapps-common-discuss] [commit] r80 - in trunk: . debian
debian/po dpkg templates
Sean Finney
seanius at costa.debian.org
Sun May 14 22:43:08 UTC 2006
Author: seanius
Date: 2006-05-14 22:43:07 +0000 (Sun, 14 May 2006)
New Revision: 80
Modified:
trunk/TODO
trunk/debian/changelog
trunk/debian/po/templates.pot
trunk/debian/webapps-common.templates
trunk/dpkg/common
trunk/dpkg/postrm
trunk/templates/apache-virtualhost.conf
Log:
couple misc fixes and changes
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/TODO 2006-05-14 22:43:07 UTC (rev 80)
@@ -4,17 +4,16 @@
choice. maybe "global" would be better because it's not the "default
host", but "all hosts" (those that include conf.d?).
-- using [new vhost] and [default] is a PITA for special case checks in
- anything that uses grep. maybe {new vhost} etc would be better...
+- newly selected virtualhosts don't seem to be updating
+ /etc/webapps-common/virtualhosts.conf
-- all code/examples using Alias _WC_.... should be modified to instead
- use something like _WC_DOCROOT_DIRECTIVE_, which will expand differently
- depending on whether the subdirectory is "/" or not.
+- we should probably prompt whether to reload the web servers
+- handling pre-existing virtualhosts. currently we end up with duplicate
+ configs...
+
further ahead:
- there are some tasks which would probably do best to be abstracted into
actual cmdline programs, like wc-newsite foobar.com or something, which
could then be used as a general purpose tool.
-
-- support multiple directories under a single vhost
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/debian/changelog 2006-05-14 22:43:07 UTC (rev 80)
@@ -5,6 +5,8 @@
a rather large rewrite of code, but much to my surprise and confusement
this "feature" resulted in almost 200 lines less of code. go figure.
* updated examples to be generally better examples
+ * fix for disabling application instances (wc_disable_instance)
+ * make sure virtualhost templates are correct
-- sean finney <seanius at debian.org> Tue, 09 May 2006 23:47:15 +0200
Modified: trunk/debian/po/templates.pot
===================================================================
--- trunk/debian/po/templates.pot 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/debian/po/templates.pot 2006-05-14 22:43:07 UTC (rev 80)
@@ -1,22 +1,14 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-10 12:48+0200\n"
+"Report-Msgid-Bugs-To: seanius at debian.org\n"
+"POT-Creation-Date: 2006-05-14 16:00-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -204,5 +196,5 @@
#. Type: string
#. Description
#: ../webapps-common.templates:97
-msgid "Please provide the subdirectory for ${pkg} on \"${vhost}\""
+msgid "Please provide the subdirectory for ${pkg} on ${vhost}"
msgstr ""
Modified: trunk/debian/webapps-common.templates
===================================================================
--- trunk/debian/webapps-common.templates 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/debian/webapps-common.templates 2006-05-14 22:43:07 UTC (rev 80)
@@ -94,4 +94,4 @@
Template: webapps-common/httpd/website_subdirectory
Type: string
-_Description: Please provide the subdirectory for ${pkg} on "${vhost}"
+_Description: Please provide the subdirectory for ${pkg} on ${vhost}
Modified: trunk/dpkg/common
===================================================================
--- trunk/dpkg/common 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/dpkg/common 2006-05-14 22:43:07 UTC (rev 80)
@@ -453,6 +453,7 @@
###
wc_disable_instance(){
local instance httpds h app_link
+ _wc_debug "wc_disable_instance() $@"
instance=$1
httpds=`grep "^$instance[[:space:]]" $wc_pkgconfig | cut -f2-`
@@ -474,6 +475,7 @@
###
wc_purge_instance(){
local instance httpds h app_link
+ _wc_debug "wc_purge_instance() $@"
instance=$1
httpds=`grep "^$instance[[:space:]]" $wc_pkgconfig | cut -f2-`
Modified: trunk/dpkg/postrm
===================================================================
--- trunk/dpkg/postrm 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/dpkg/postrm 2006-05-14 22:43:07 UTC (rev 80)
@@ -20,13 +20,12 @@
}
wc_postrm_disable_app(){
- local instance line httpds reload_list
+ local instance httpds reload_list
_wc_debug "wc_postrm_disable_app() $@"
# for each configuration line in the file
- grep -vE '^[[:space:]]*(#|$)' "$wc_pkgconfig" | while read line; do
- instance=`echo $line | cut -f1`
- httpds=`echo $line | cut -f2-`
+ grep -vE '^[[:space:]]*(#|$)' "$wc_pkgconfig" | cut -f1 | while read instance; do
+ httpds=`grep "^$instance[[:space:]]" "$wc_pkgconfig" | cut -f2`
wc_disable_instance "$instance"
reload_list=`_wc_list_join "$reload_list" "$httpds"`
done
Modified: trunk/templates/apache-virtualhost.conf
===================================================================
--- trunk/templates/apache-virtualhost.conf 2006-05-14 20:47:22 UTC (rev 79)
+++ trunk/templates/apache-virtualhost.conf 2006-05-14 22:43:07 UTC (rev 80)
@@ -1,3 +1,4 @@
+NameVirtualHost *
<VirtualHost _WC_VHOST_>
Include /etc/webapps-common/apps-enabled/_WC_HTTPD_/_WC_VHOST_/*.conf
</VirtualHost>
More information about the Webapps-common-discuss
mailing list