| [vhffs-dev] [svn] commit: r81 - in trunk: Makefile debian/apache-panel.conf debian/apache2-panel.conf debian/control debian/rules debian/vhffs-api.dirs vhffs-backend/conf/vhffs.conf vhffs-panel/templates/main/auth.tmpl |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
- To: vhffs-dev@xxxxxxxxx
- Subject: [vhffs-dev] [svn] commit: r81 - in trunk: Makefile debian/apache-panel.conf debian/apache2-panel.conf debian/control debian/rules debian/vhffs-api.dirs vhffs-backend/conf/vhffs.conf vhffs-panel/templates/main/auth.tmpl
- From: vhffs-dev@xxxxxxxxx
- Date: Sat Jul 30 09:43:52 2005 +00
Author: soda
Date: Sat Jul 30 11:43:45 2005
New Revision: 81
Log:
Fix packaging bugs
Modified:
trunk/Makefile
trunk/debian/apache-panel.conf
trunk/debian/apache2-panel.conf
trunk/debian/control
trunk/debian/rules
trunk/debian/vhffs-api.dirs
trunk/vhffs-backend/conf/vhffs.conf
trunk/vhffs-panel/templates/main/auth.tmpl
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sat Jul 30 11:43:45 2005
@@ -64,6 +64,7 @@
find "${DESTDIR}/${TEMPLATESDIR}/" -type f | xargs chmod 644
fi
echo "done"
+
echo -n "Install VHFFS backend files ... "
rm -rf "${DESTDIR}/${BACKENDDIR}" 1>/dev/null 2>&1
Modified: trunk/debian/apache-panel.conf
==============================================================================
--- trunk/debian/apache-panel.conf (original)
+++ trunk/debian/apache-panel.conf Sat Jul 30 11:43:45 2005
@@ -1,4 +1,4 @@
-Alias /vhffs/ "/usr/share/vhffs/panel/"
+Alias /vhffs "/usr/share/vhffs/panel/"
<Directory /usr/share/vhffs/panel>
Modified: trunk/debian/apache2-panel.conf
==============================================================================
--- trunk/debian/apache2-panel.conf (original)
+++ trunk/debian/apache2-panel.conf Sat Jul 30 11:43:45 2005
@@ -1,4 +1,4 @@
-Alias /vhffs/ "/usr/share/vhffs/panel"
+Alias /vhffs "/usr/share/vhffs/panel"
<Directory /usr/share/vhffs/panel>
DirectoryIndex auth.pl
Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control (original)
+++ trunk/debian/control Sat Jul 30 11:43:45 2005
@@ -10,7 +10,7 @@
Section: perl
Architecture: all
Recommends: vhffs-panel
-Depends: ${perl:Depends} libcrypt-passwdmd5-perl, libmime-lite-perl, libconfig-general-perl, liblocale-gettext-perl, libdbd-pgsql, libclass-dbi-pg-perl, libmime-lite-perl, libcrypt-passwdmd5-perl, vhffs-configfile
+Depends: ${perl:Depends}, libcrypt-passwdmd5-perl, libmime-lite-perl, libconfig-general-perl, liblocale-gettext-perl, libdbd-pgsql, libclass-dbi-pg-perl, libmime-lite-perl, libcrypt-passwdmd5-perl, libemail-valid-perl, libconfig-general-perl, vhffs-configfile
Description: main API of VHFFS
VHFFS API is requested by any VHFFS composant. So, it must
be installed in order to run VHFFS.
Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Sat Jul 30 11:43:45 2005
@@ -62,6 +62,7 @@
install -m 644 $(INSTDIR)/usr/share/perl5/Vhffs/Robots/*.pm $(APIDIR)/usr/share/perl5/Vhffs/Robots
install -m 644 $(INSTDIR)/usr/share/perl5/Vhffs/Services/*.pm $(APIDIR)/usr/share/perl5/Vhffs/Services
install -m 644 $(INSTDIR)/usr/share/perl5/Vhffs/Misc/*.pm $(APIDIR)/usr/share/perl5/Vhffs/Misc
+ install -m 644 $(INSTDIR)/usr/share/perl5/Vhffs/Panel/*.pm $(APIDIR)/usr/share/perl5/Vhffs/Panel
###########################################
#Robots packaging
@@ -83,6 +84,10 @@
cp -r $(INSTDIR)/usr/share/vhffs/templates/* $(PANELDIR)/usr/share/vhffs/templates/
find $(PANELDIR)/usr/share/vhffs/templates -type f | xargs chmod 644
find $(PANELDIR)/usr/share/vhffs/templates -type d | xargs chmod 755
+
+ cp -r $(INSTDIR)/usr/share/vhffs/themes/* $(PANELDIR)/usr/share/vhffs/themes/
+ find $(PANELDIR)/usr/share/vhffs/themes -type f | xargs chmod 644
+ find $(PANELDIR)/usr/share/vhffs/themes -type d | xargs chmod 755
#Install apache configfile in /etc/vhffs/
install -m 644 debian/apache-panel.conf $(PANELDIR)/etc/vhffs/
Modified: trunk/debian/vhffs-api.dirs
==============================================================================
--- trunk/debian/vhffs-api.dirs (original)
+++ trunk/debian/vhffs-api.dirs Sat Jul 30 11:43:45 2005
@@ -2,3 +2,4 @@
usr/share/perl5/Vhffs/Robots/
usr/share/perl5/Vhffs/Services/
usr/share/perl5/Vhffs/Misc/
+usr/share/perl5/Vhffs/Panel/
Modified: trunk/vhffs-backend/conf/vhffs.conf
==============================================================================
--- trunk/vhffs-backend/conf/vhffs.conf (original)
+++ trunk/vhffs-backend/conf/vhffs.conf Sat Jul 30 11:43:45 2005
@@ -1,14 +1,14 @@
<global>
host_name = Tuxfamily.org
datadir = /data
- templatedir = /home/soda/vhffs/vhffs-panel/templates/
- themesdir = /home/soda/vhffs/vhffs-panel/themes/
- intldir = /home/soda/vhffs/vhffs-intl/result/
+ templatedir = /usr/share/vhffs/templates/
+ themesdir = /usr/share/vhffs/panel/themes/
+ intldir = /usr/share/vhffs/intl/
default_template = default
- vhffs_master = VHFFS Admins <soda@xxxxxxxxx>
+ vhffs_master = VHFFS Admin <admin@localhost>
mailtag = [VHFFS]
allow_subscribe = yes
- alert_mail = julien@xxxxxxxxx
+ alert_mail = root@localhost
<modules>
use_web = yes
@@ -23,11 +23,11 @@
use_mailuser = yes
</modules>
<panel>
- help_url = http://faq.tuxfamily.org
- stats_url = http://stats.tuxfamily.net
- phpmyadmin_url = http://phpmyadmin.tuxfamily.net
- phppgadmin_url = http://phppgadmin.tuxfamily.net
- url = http://panel.tuxfamily.org
+ url = http://your.panel.url
+ help_url = http://help.hoster
+ stats_url = http://stats.hoster
+ phpmyadmin_url = http://phpmyadmin.hoster
+ phppgadmin_url = http://phppgadmin.hoster
use_public = yes
users = yes
groups = yes
@@ -137,10 +137,10 @@
#####################################
<services>
<dns>
- default_ns1 = ns1.tuxfamily.org
- default_ns2 = ns2.tuxfamily.org
- default_mx1 = mx1.tuxfamily.org
- default_mx2 = mx2.tuxfamily.org
+ default_ns1 = ns1.hoster.org
+ default_ns2 = ns2.hoster.org
+ default_mx1 = mx1.hoster.org
+ default_mx2 = mx2.hoster.org
default_a = 1.2.3.4
@@ -153,15 +153,15 @@
default_minimum = 86400
default_serial = 1
- default_mbox = adm.heresie.tuxfamily.net.
+ default_mbox = adm.your.hoster.ext.
<init>
<a>
www = 80.0.0.1
default = 10.0.0.1
</a>
<mx>
- 10 = mx1.tuxfamily.org
- 20 = mx2.tuxfamily.org
+ 10 = mx1.hoster.org
+ 20 = mx2.hoster.org
</mx>
<ns>
ns1.tf.o
@@ -178,8 +178,8 @@
</apache>
<cvs>
- cvsweb_url = "http://cvsweb.tuxfamily.org";
- cvsdoc_url = "http://faq.tuxfamily.org/wakka.php?wiki=FaqCVS";
+ cvsweb_url = "http://cvsweb.hoster";
+ cvsdoc_url = "http://faq.hoster";
</cvs>
<mysql>
host = localhost
@@ -205,8 +205,8 @@
</mailing>
<listengine>
datadir = "/data/listengine"
- listmaster = "listmaster@xxxxxxxxxxxxx"
+ listmaster = "listmaster@xxxxxxxxxx"
smtp_server = "localhost"
- templatesdir = "/home/soda/vhffs/vhffs-listengine/src/archives/templates"
+ templatesdir = ""
</listengine>
</services>
Modified: trunk/vhffs-panel/templates/main/auth.tmpl
==============================================================================
--- trunk/vhffs-panel/templates/main/auth.tmpl (original)
+++ trunk/vhffs-panel/templates/main/auth.tmpl Sat Jul 30 11:43:45 2005
@@ -52,7 +52,7 @@
<tmpl_var name="TEXT_STATS">
</p>
<p>
- <a href="/public/index.pl"><tmpl_var name="TEXT_PUBLIC"></a>
+ <a href="public/index.pl"><tmpl_var name="TEXT_PUBLIC"></a>
</p>
</div>