Changeset 2921


Ignore:
Timestamp:
Jan 23, 2010, 1:01:49 AM (15 years ago)
Author:
gdb
Message:

Moved things around to make config generation work

Location:
package_branches/invirt-web/hvirt
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • package_branches/invirt-web/hvirt/debian/changelog

    r2913 r2921  
     1invirt-web (0.1.5hvirt5) unstable; urgency=low
     2
     3  * Changed master -> invirt
     4
     5 -- Greg Brockman <gdb@mit.edu>  Sat, 23 Jan 2010 00:59:11 -0500
     6
     7invirt-web (0.1.5hvirt4) unstable; urgency=low
     8
     9  * Now use invirt-mako-render, so set path appropriately
     10
     11 -- Greg Brockman <gdb@mit.edu>  Sat, 23 Jan 2010 00:41:44 -0500
     12
     13invirt-web (0.1.5hvirt3) unstable; urgency=low
     14
     15  * Fixed some minor bugs
     16
     17 -- Greg Brockman <gdb@mit.edu>  Fri, 22 Jan 2010 02:17:21 -0500
     18
     19invirt-web (0.1.5hvirt2) unstable; urgency=low
     20
     21  * Removed old mako templates.
     22
     23 -- Greg Brockman <gdb@mit.edu>  Fri, 22 Jan 2010 02:08:55 -0500
     24
    125invirt-web (0.1.5hvirt1) unstable; urgency=low
    226

  • package_branches/invirt-web/hvirt/debian/control

    r2863 r2921  
    1313 invirt-dns, invirt-vnc-client, invirt-iptables,
    1414# web server
    15  apache2, libapache2-mod-fcgid, libapache2-svn,
    16  libapache2-mod-auth-sslcert, libapache2-mod-auth-kerb,
    17  debathena-ssl-certificates,
     15 apache2, libapache2-mod-fcgid,
    1816# python libraries
    1917 python-flup, python-simplejson,
    … …  
    2119 python-mako,
    2220# misc
    23  kstart,
    24  debathena-afs-config, openafs-modules-xen,
    25  mail-transport-agent, subversion, zephyr-clients,
    26  cron,
     21 mail-transport-agent, subversion, cron
     22Recommends: libapache2-svn, libapache2-mod-auth-sslcert,
     23 libapache2-mod-auth-kerb, debathena-ssl-certificates,
     24 zephyr-clients
    2725Provides: ${diverted-files}
    2826Conflicts: ${diverted-files}

  • package_branches/invirt-web/hvirt/debian/invirt-web.init

    r2913 r2921  
    1212PACKAGE=invirt-web
    1313PARENTPACKAGE=apache2
    14 GEN_FILES=(/etc/apache2/sites-available/master /etc/invirt-iptables/rules.d/50-invirt-web)
     14GEN_FILES=(/etc/apache2/sites-available/invirt /etc/invirt-iptables/rules.d/50-invirt-web)
    1515
    1616. /lib/init/config-init.sh

  • package_branches/invirt-web/hvirt/files/etc/apache2/sites-available/invirt.mako

    r2916 r2921  
    5656
    5757% for site in cfg.web.sites:
    58 <%include file="../conf.invirt/${site}.mako" args="cfg=cfg, invirt_ssl=invirt_ssl" />
     58<%include file="${site}.mako" args="cfg=cfg, invirt_ssl=invirt_ssl" />
    5959% endfor
Note: See TracChangeset for help on using the changeset viewer.