Changeset ,422

Timestamp:

11/21/07 10:43:09 (14 months ago)

Author:

fidojones

branch-nick:

bzr

Message:

preparación de paquete debian

Location:

trunk

Files:

• debian/pycompat (deleted)
• Makefile (modified) (4 diffs)
• debian/README.Debian (modified) (1 diff)
• debian/control (modified) (2 diffs)
• debian/copyright (modified) (1 diff)
• debian/docs (modified) (1 diff)
• debian/postinst (modified) (1 diff)
• debian/postrm (modified) (1 diff)
• debian/rules (modified) (2 diffs)
• panel/admin_panel/config/main_config_debian.php (modified) (1 diff)

trunk/Makefile

@@ -2 +2 @@
 
 
-all:
-        cd languages && make
+#all:
+#       cd languages && make
 
 test:
-        @echo "TCOSPHPMONITOR version="$(VERSION)
+        @echo "Baifox version="$(VERSION)
 
 clean:
-        find -type f -name "*~" | xargs rm -f
-        rm -f build-stamp
-        rm -f smarty/templates_c/*
-        rm -f smarty/cache/*
+        rm -rf `find ../* -type d -name .svn`
+#       find -type f -name "*~" | xargs rm -f
+#       rm -f build-stamp
+#       rm -f smarty/templates_c/*
+#       rm -f smarty/cache/*
 
 echo:
@@ -18 +19 @@
         
 
-gedit: clean
-        gedit $$(find -type f $(EDIT_FILES) ) &
-
-
-permisos:
-        chown -R www-data:www-data smarty/
-
-pot:
-        cd languages && make pot
+#gedit: clean
+#       gedit $$(find -type f $(EDIT_FILES) ) &
+
+
+#permisos:
+#       chown -R www-data:www-data smarty/
+
+#pot:
+#       cd languages && make pot
 
 install:
@@ -163 +164 @@
         install -d $(DESTDIR)/usr/share/baifox/scripts
 
-        install -m 644 data.inc.php $(DESTDIR)/usr/share/tcosphpmonitor/
-        install -m 644 config.inc.php $(DESTDIR)/etc/tcosphpmonitor/tcosphpmonitor.php
-
-        # configure __VERSION__ and DEBUG
-        sed -i s/'__VERSION__'/'$(VERSION)'/g $(DESTDIR)/usr/share/tcosphpmonitor/data.inc.php
-
-        sed -i "/DEBUG/s/"true"/"false"/g"    $(DESTDIR)/etc/tcosphpmonitor/tcosphpmonitor.php
-
-        # empty username and password
-        sed -i "/USERNAME/s/"admin"/""/g"    $(DESTDIR)/etc/tcosphpmonitor/tcosphpmonitor.php
-        sed -i "/PASSWORD/s/"admin"/""/g"    $(DESTDIR)/etc/tcosphpmonitor/tcosphpmonitor.php
-
-        install -m 644 apache.conf    $(DESTDIR)/etc/tcosphpmonitor/apache.conf
-
-        for i in `find www/ -type f -name "*.php"`; do install -m 644 $$i $(DESTDIR)/usr/share/tcosphpmonitor/$$i; done
-        for i in `find www/js -type f -name "*.js" -o -name "*.php"`; do install -m 644 $$i $(DESTDIR)/usr/share/tcosphpmonitor/$$i; done
-        for i in `find www/css -type f -name "*.css"`; do install -m 644 $$i $(DESTDIR)/usr/share/tcosphpmonitor/$$i; done
-        for i in `find www/img -type f -name "*.png" -o -name "*.jpg" -o -name "*.gif"`; do install -m 644 $$i $(DESTDIR)/usr/share/tcosphpmonitor/$$i; done
-
-
-        for i in `find classes/ -type f -name "*.php"`; do install -m 644 $$i $(DESTDIR)/usr/share/tcosphpmonitor/$$i; done
-        for i in `find modules/ -type f -name "*.php"`; do install -m 644 $$i $(DESTDIR)/usr/share/tcosphpmonitor/$$i; done
-        for i in `find templates/ -type f -name "*.tpl"`; do install -m 644 $$i $(DESTDIR)/usr/share/tcosphpmonitor/$$i; done
-
-        install -m 644 helpers/tcos-dbus.py $(DESTDIR)/usr/share/tcosphpmonitor/helpers/tcos-dbus.py
-
-        cd languages && make install DESTDIR=$(DESTDIR)
+#       Nanoweb
+        install -m 744 nanowebserver/bin/htpasswd_debian.php $(DESTDIR)/usr/share/baifox/nanowebserver/bin/htpasswd.php
+        install -m 744 nanowebserver/bin/in.nanoweb $(DESTDIR)/usr/share/baifox/nanowebserver/bin/in.nanoweb
+        install -m 744 nanowebserver/bin/nanoctl $(DESTDIR)/usr/share/baifox/nanowebserver/bin/nanoctl
+        install -m 744 nanowebserver/bin/nanoweb_debian.php $(DESTDIR)/usr/share/baifox/nanowebserver/bin/nanoweb.php
+        for i in `find nanowebserver/doc/ -type f -name "*"`; do install -m 644 $$i $(DESTDIR)/usr/share/baifox/$$i; done
+        for i in `find nanowebserver/etc/ -type f -name "*"`; do install -m 644 $$i $(DESTDIR)/usr/share/baifox/$$i; done
+
+        install -m 644 nanowebserver/etc/default.theme $(DESTDIR)/usr/share/baifox/nanowebserver/etc/default.theme
+        install -m 644 nanowebserver/etc/fancy.theme $(DESTDIR)/usr/share/baifox/nanowebserver/etc/fancy.theme
+        install -m 644 nanowebserver/etc/mime.types $(DESTDIR)/usr/share/baifox/nanowebserver/etc/mime.types
+        install -m 644 nanowebserver/etc/modules.conf $(DESTDIR)/usr/share/baifox/nanowebserver/etc/modules.conf
+        install -m 644 nanowebserver/etc/nanoweb_debian.conf $(DESTDIR)/usr/share/baifox/nanowebserver/etc/nanoweb.conf
+        install -m 644 nanowebserver/etc/nanoweb.theme $(DESTDIR)/usr/share/baifox/nanowebserver/etc/nanoweb.theme
+        install -m 644 nanowebserver/etc/vhosts.conf $(DESTDIR)/usr/share/baifox/nanowebserver/etc/vhosts.conf
+        sed -i "s/\/usr\/local\/baifox\/panel/\/usr\/share\/baifox\/panel/g"    $(DESTDIR)/usr/share/baifox/nanowebserver/etc/vhosts.conf
+
+        for i in `find nanowebserver/lib/ -type f -name "*"`; do install -m 644 $$i $(DESTDIR)/usr/share/baifox/$$i; done
+
+#       panel
+        for i in `find panel/ -type f -name "*"`; do install -m 644 $$i $(DESTDIR)/usr/share/baifox/$$i; done
+        install -m 744 panel/admin_panel/cron.php $(DESTDIR)/usr/share/baifox/panel/admin_panel/cron.php
+        install -m 644 panel/admin_panel/config/main_config_debian.php $(DESTDIR)/usr/share/baifox/panel/admin_panel/config/main_config.php
+        rm $(DESTDIR)/usr/share/baifox/panel/admin_panel/config/main_config_debian.php
+
+#       scripts
+        for i in `find scripts/ -type f -name "*.php"`; do install -m 744 $$i $(DESTDIR)/usr/share/baifox/$$i; done
+
 
 targz: clean
@@ -197 +199 @@
         cp -ra * ../tmp
         rm -rf `find ../tmp/* -type d -name .svn`
-        mv ../tmp ../tcosphpmonitor-$(VERSION)
-        tar -czf ../tcosphpmonitor-$(VERSION).tar.gz ../tcosphpmonitor-$(VERSION)
-        rm -rf ../tcosphpmonitor-$(VERSION)
-
-patch_version:
-        # nothing to patch
-
-patch_dapper: patch_version
-        # nothing to patch
-
-
-patch_edgy: patch_version
-        # nothing to patch
-
-patch_feisty: patch_version
-        # nothing to patch
-
-patch_gutsy: patch_version
-        # nothing to patch
-
-patch_etch: patch_version
-        # nothing to patch
-
-patch_unstable: patch_version
-        # nothing to patch
-
-
+        mv ../tmp ../baifox-$(VERSION)
+        tar -czf ../baifox-$(VERSION).tar.gz ../baifox-$(VERSION)
+        rm -rf ../baifox-$(VERSION)
+
+#patch_version:
+#        nothing to patch
+
+#patch_dapper: patch_version
+#        nothing to patch
+
+#patch_edgy: patch_version
+#        nothing to patch
+
+#patch_feisty: patch_version
+#        nothing to patch
+
+#patch_gutsy: patch_version
+#        nothing to patch
+
+#patch_etch: patch_version
+#        nothing to patch
+
+#patch_unstable: patch_version
+#        nothing to patch
+
+

trunk/debian/README.Debian

@@ -1 @@
-tcosphpmonitor for Debian
+Baifox for Debian
 -------------------------
 
-This package will create an virtualhost file in:
+Primera version
 
-  /etc/apache2/conf.d/tcosphpmonitor.conf
-  /etc/apache/conf.d/tcosphpmonitor.conf
-
-You should open any browser and go to:
-
-  http://server_name_or_ip/tcosphpmonitor
-
-Perpahps you need to restart apache to load settings.
-
- -- Mario Izquierdo (mariodebian) <mariodebian@gmail.com>, Fri, 30 Mar 2007 20:35:34 +0200
+ -- Lorenzo Tejera (fidojones) <fidojones@fidojones.com>, Tue, 20 Nov 2007 20:35:34 +0200

trunk/debian/control

@@ -3 +3 @@
 Priority: optional
 Maintainer: Lorenzo Tejera (fidojones) <fidojones@fidojones.com>
-Build-Depends:  debhelper (>= 5.0.37.2), python, python-support (>= 0.3)
+Build-Depends:  debhelper (>= 5)
 Standards-Version: 3.7.2
-XS-Python-Version: >= 2.4
 XS-Vcs-Browser: http://www.baifox.org/trac/browser/trunk
 XS-Vcs-Svn: http://www.baifox.org/baifox/trunk
@@ -11 +10 @@
 Package: baifox
 Architecture: all
-Depends:  libapache2-mod-php4 | libapache-mod-php4 | libapache2-mod-php5 | libapache-mod-php5 ,
-          apache2 | apache, smarty, php4 | php5, 
-          ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-dbus | python2.4-dbus
-XB-Python-Version: ${python:Versions}
-Description: Small PHP web based app to monitor a TCOS thin client network.
- TCOS, thin Client Operating System is a method to create small embedded os
- based on debian/ubuntu with normal debian kernel's.
- .
- baifox is a small PHP web based app to monitor a thin client network.
- .
-  Homepage: http://www.baifox.org
+Depends:  apache
+Description: Baifox is a GPL control panel to managed 
+    services of a hosting service.
+Homepage: http://www.baifox.org

trunk/debian/copyright

@@ -1 @@
-This package was debianized by Mario Izquierdo (mariodebian) <mariodebian@gmail.com> on
-Fri, 30 Mar 2007 18:35:34 +0200.
+This package was debianized by Lorenzo Tejera (fidojones) <fidojones@fidojones.com> on
+Tue, 20 Nov 2007 18:35:34 +0200.
 
-It was created by Mario Izquierdo (mariodebian)
-       mariodebian@gmail.com
+It was created by Lorenzo Tejera (fidojones)
+       fidojones@fidojones.com
 
 
 License:
 
- * web/js/ files: builder.js controls.js dragdrop.js effects.js 
-                  scriptaculous.js slider.js unittest.js
-
-   Downloaded from: http://script.aculo.us/
-   License: http://www.opensource.org/licenses/mit-license.php
-
- Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- For details, see the script.aculo.us web site: http://script.aculo.us/
-
-------------------------------------------------------------------------
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
-   USA.
-
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.

trunk/debian/docs

@@ -1 @@
-README

trunk/debian/postinst

@@ -1 +1 @@
 #!/bin/bash
-set -e
+#set -e
 
-if [ -d /etc/apache2/conf.d/ ] && [ ! -e /etc/apache2/conf.d/tcosphpmonitor.conf ] ; then
+#if [ -d /etc/apache2/conf.d/ ] && [ ! -e /etc/apache2/conf.d/tcosphpmonitor.conf ] ; then
 # ln -s /etc/tcosphpmonitor/apache.conf /etc/apache2/conf.d/tcosphpmonitor.conf
-fi
+#fi
 
-if [ -d /etc/apache/conf.d/ ] && [ ! -e /etc/apache/conf.d/tcosphpmonitor.conf ]; then
+i#f [ -d /etc/apache/conf.d/ ] && [ ! -e /etc/apache/conf.d/tcosphpmonitor.conf ]; then
 # ln -s /etc/tcosphpmonitor/apache.conf /etc/apache/conf.d/tcosphpmonitor.conf
+#fi
+
+if [ -f "/etc/init.d/baifox" ]; then
+  update-rc.d baifox defaults 99 >/dev/null
 fi
 

trunk/debian/postrm

@@ -1 +1 @@
 #!/bin/bash
-set -e
+#set -e
 
-if [ "$1" = "purge" ]; then
-  if [ -f /etc/apache2/conf.d/tcosphpmonitor.conf ]; then
+#if [ "$1" = "purge" ]; then
+#  if [ -f /etc/apache2/conf.d/tcosphpmonitor.conf ]; then
 #   rm /etc/apache2/conf.d/tcosphpmonitor.conf
-  fi
+#  fi
 
-  if [ -d /etc/apache/conf.d/tcosphpmonitor.conf ]; then
+#  if [ -d /etc/apache/conf.d/tcosphpmonitor.conf ]; then
 #  rm /etc/apache/conf.d/tcosphpmonitor.conf
-  fi
+#  fi
 
-  rm -rf /var/cache/tcosphpmonitor
-fi
+#  rm -rf /var/cache/tcosphpmonitor
+#fi
 
 #DEBHELPER#

trunk/debian/rules

@@ -28 +28 @@
         dh_installdirs
 
-        $(MAKE) install DESTDIR=$(CURDIR)/debian/tcosphpmonitor
-
-
-        chown root:www-data $(CURDIR)/debian/tcosphpmonitor/etc/tcosphpmonitor/tcosphpmonitor.php
-        chmod 640 $(CURDIR)/debian/tcosphpmonitor/etc/tcosphpmonitor/tcosphpmonitor.php
-        dh_link /etc/tcosphpmonitor/tcosphpmonitor.php /usr/share/tcosphpmonitor/config.inc.php
-
-        chown root:www-data $(CURDIR)/debian/tcosphpmonitor/var/cache/tcosphpmonitor
-        chmod 770 $(CURDIR)/debian/tcosphpmonitor/var/cache/tcosphpmonitor
-
+        $(MAKE) install DESTDIR=$(CURDIR)/debian/baifox
 
 # Build architecture-independent files here.
@@ -45 +36 @@
         dh_installchangelogs 
         dh_installdocs
-        dh_pysupport
         dh_link
         dh_strip
         dh_compress
-        dh_fixperms -X/var/cache/tcosphpmonitor -X/etc/tcosphpmonitor/tcosphpmonitor.php
+        dh_fixperms
         dh_installdeb
         dh_shlibdeps

trunk/panel/admin_panel/config/main_config_debian.php

@@ -7 +7 @@
 define("_CFG_INTERFACE_MYSQLUSER","baifox_panel"); //usuario de la base de datos baifox
 define("_CFG_INTERFACE_MYSQLPASSWORD","[VAR_MYSQLBAIFOX_PASSWORD]"); //contraseña de la base de datos baifox
-define("_CFG_INTERFACE_DIR","/usr/local/baifox/panel/");
+define("_CFG_INTERFACE_DIR","/usr/share/baifox/panel/");
 define("_CFG_INTERFACE_DIRMODULES",_CFG_INTERFACE_DIR."admin_panel/modulos/");
 define("_CFG_INTERFACE_LIBRERIA",_CFG_INTERFACE_DIR."libreria.php");