webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hinzugefügt:

Browse Source 
* XAMPP mit Python
Geändert:
  * Installationsprozess von PHPAJ
  * shutdown.cgi auf ipfire angepasst
  * Make-Packages.sh behebt jetzt doppelte Dateien in den Pak-Archiven.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@146 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-05-27 10:38:03 +00:00
parent a79906a4c5
commit 8891c0e82c
5 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
html/cgi-bin/shutdown.cgi
View File

@@ -30,13 +30,13 @@ $cgiparams{'ACTION'} = '';
if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) { if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) {
$death = 1; $death = 1;
&General::log($Lang::tr{'shutting down ipcop'}); &General::log($Lang::tr{'shutting down ipcop'});
#system '/usr/local/bin/ipcopdeath'; #system '/usr/local/bin/ipfiredeath';
system '/usr/local/bin/ipcopreboot down'; system '/usr/local/bin/ipfirereboot down';
} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) { } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) {
$rebirth = 1; $rebirth = 1;
&General::log($Lang::tr{'rebooting ipcop'}); &General::log($Lang::tr{'rebooting ipcop'});
#system '/usr/local/bin/ipcoprebirth'; #system '/usr/local/bin/ipfirerebirth';
system '/usr/local/bin/ipcopreboot boot'; system '/usr/local/bin/ipfirereboot boot';
} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
my $days=''; my $days='';
my $n = 1; my $n = 1;
@@ -53,10 +53,10 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) {
($hour,$min) = split (':', $cgiparams{'TIME'}); ($hour,$min) = split (':', $cgiparams{'TIME'});
$days = "'*'" if ($days eq '1,2,3,4,5,6,7'); $days = "'*'" if ($days eq '1,2,3,4,5,6,7');
my $mode = ($cgiparams{'MODE'} eq 'halt') ? '-h' : '-r'; my $mode = ($cgiparams{'MODE'} eq 'halt') ? '-h' : '-r';
system "/usr/local/bin/ipcopreboot cron+ $min $hour $days $mode"; #reboot checks values of $hour & $min system "/usr/local/bin/ipfirereboot cron+ $min $hour $days $mode"; #reboot checks values of $hour & $min
} else { } else {
&General::log("Remove scheduled reboot"); &General::log("Remove scheduled reboot");
system '/usr/local/bin/ipcopreboot cron-'; system '/usr/local/bin/ipfirereboot cron-';
} }
} }
if ($death == 0 && $rebirth == 0) { if ($death == 0 && $rebirth == 0) {
@@ -86,7 +86,7 @@ END
#decode the shutdown line stored in crontab #decode the shutdown line stored in crontab
#get the line #get the line
open(FILE, "/usr/local/bin/ipcopreboot cron?|"); open(FILE, "/usr/local/bin/ipfirereboot cron?|");
my $schedule = <FILE>; my $schedule = <FILE>;
close (FILE); close (FILE);

2
lfs/applejuice
View File

@@ -77,6 +77,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && mkdir -p /opt/applejuice && mv -fv ajcore.jar /opt/applejuice cd $(DIR_APP) && mkdir -p /opt/applejuice && mv -fv ajcore.jar /opt/applejuice
cd $(DIR_APP) && mv -fv libajnetmask.so /opt/applejuice cd $(DIR_APP) && mv -fv libajnetmask.so /opt/applejuice
cd $(DIR_APP) && mv -fv phpaj /opt/lampp/htdocs cd $(DIR_APP) && cp -rfv phpaj /opt/lampp/htdocs
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

25
lfs/xampp
View File

@@ -31,7 +31,7 @@ VER = 1.5.1
THISAPP = xampp-linux-$(VER) THISAPP = xampp-linux-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE) DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = /opt/lampp
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
############################################################################### ###############################################################################
@@ -40,15 +40,18 @@ TARGET = $(DIR_INFO)/$(THISAPP)
objects = $(DL_FILE) \ objects = $(DL_FILE) \
xampp-linux-devel-1.5.1.tar.gz \ xampp-linux-devel-1.5.1.tar.gz \
PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz \
Python-AddOn-1.3.tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
xampp-linux-devel-$(VER).tar.gz = $(URL_IPFIRE)/xampp-linux-devel-$(VER).tar.gz xampp-linux-devel-$(VER).tar.gz = $(URL_IPFIRE)/xampp-linux-devel-$(VER).tar.gz
PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz = $(URL_IPFIRE)/PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz = $(URL_IPFIRE)/PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz
Python-AddOn-1.3.tar.gz = $(URL_IPFIRE)/Python-AddOn-1.3.tar.gz
$(DL_FILE)_MD5 = baefcf7ac3629a641c7b75c547564a3f $(DL_FILE)_MD5 = baefcf7ac3629a641c7b75c547564a3f
xampp-linux-devel-$(VER).tar.gz_MD5 = e4ab1c867551a831ae6af38fa3c4dfd9 xampp-linux-devel-$(VER).tar.gz_MD5 = e4ab1c867551a831ae6af38fa3c4dfd9
PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz_MD5 = 63171afe553fd557032407e1ba6af477 PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz_MD5 = 63171afe553fd557032407e1ba6af477
Python-AddOn-1.3.tar.gz_MD5 = 5a962ea63c3e502227c8cca30e0ce786
install : $(TARGET) install : $(TARGET)
@@ -83,12 +86,24 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C /opt cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C /opt
cd $(DIR_SRC) && tar zxf $(DIR_DL)/xampp-linux-devel-$(VER).tar.gz -C /opt cd $(DIR_SRC) && tar zxf $(DIR_DL)/xampp-linux-devel-$(VER).tar.gz -C /opt
cd $(DIR_SRC) && tar zxf $(DIR_DL)/Python-AddOn-1.3.tar.gz -C /tmp
cd $(DIR_SRC) && tar zxf $(DIR_DL)/PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz -C /tmp cd $(DIR_SRC) && tar zxf $(DIR_DL)/PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz -C /tmp
cd /tmp/PostGreSQL-AddOn-1.0-pgsql8.1 && ./INSTALL cd /tmp/PostGreSQL-AddOn-1.0-pgsql8.1 && ./INSTALL
rm -rf /tmp/PostGreSQL-AddOn-1.0-pgsql8.1 rm -rf /tmp/PostGreSQL-AddOn-1.0-pgsql8.1
cd /tmp/Python-AddOn-1.3 && cp -frv lampp/bin /opt/lampp
cd /tmp/Python-AddOn-1.3 && cp -frv lampp/cgi-bin /opt/lampp
cd /tmp/Python-AddOn-1.3 && cp -frv lampp/etc /opt/lampp
cd /tmp/Python-AddOn-1.3 && cp -frv lampp/htdocs /opt/lampp
cd /tmp/Python-AddOn-1.3 && cp -frv lampp/include /opt/lampp
cd /tmp/Python-AddOn-1.3 && cp -frv lampp/lib /opt/lampp
# cd /tmp/Python-AddOn-1.3 && cp -frv lampp/licenses /opt/lampp
# cd /tmp/Python-AddOn-1.3 && cp -frv lampp/man /opt/lampp
cd /tmp/Python-AddOn-1.3 && cp -frv lampp/modules /opt/lampp
# cd /tmp/Python-AddOn-1.3 && cp -frv lampp/share /opt/lampp
rm -rf /tmp/Python-AddOn-1.3
grep etc/python.conf /opt/lampp/etc/httpd.conf || echo -e "Include etc/python.conf" /opt/lampp/etc/httpd.conf
chown -R nobody.nobody /opt/lampp/htdocs chown -R nobody.nobody /opt/lampp/htdocs
ln -s /opt/lampp/lib/mysql/libmysqlclient.* /usr/lib ln -fs /opt/lampp/lib/mysql/libmysqlclient.* /usr/lib
ln -s /opt/lampp/lib/libpq.* /usr/lib ln -fs /opt/lampp/lib/libpq.* /usr/lib
ldconfig ldconfig
@rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

3
make.sh
View File

@@ -824,7 +824,8 @@ buildpackages() {
ipfiredist xampp ipfiredist xampp
ipfiredist xinetd ipfiredist xinetd
test -d $BASEDIR/packages || mkdir $BASEDIR/packages test -d $BASEDIR/packages || mkdir $BASEDIR/packages
cp -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1 mv -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
rm -rf $LFS/paks
# Cleanup # Cleanup
stdumount stdumount

11
src/scripts/make-packages.sh
View File

@@ -14,9 +14,16 @@ cd / && mkdir -p /paks/$1
cp -f /usr/src/src/paks/$1/{,un}install.sh /paks/$1 cp -f /usr/src/src/paks/$1/{,un}install.sh /paks/$1
chmod 755 /paks/$1/{,un}install.sh chmod 755 /paks/$1/{,un}install.sh
tar cvfz /paks/$1/files.tgz --files=/usr/src/src/paks/$1/ROOTFILES --exclude='#*' # This tar+untar+tar is for removing files compressed twice
tar cvf /paks/$1/filestmp.tar --files=/usr/src/src/paks/$1/ROOTFILES --exclude='#*'
tar cvf /paks/$1/conftmp.tar --files=/usr/src/src/paks/$1/CONFFILES --exclude='#*'
tar cvfz /paks/$1/conf.tgz --files=/usr/src/src/paks/$1/CONFFILES --exclude='#*' mkdir -p /paks/$1/ROOT /paks/$1/CONF
tar xvf /paks/$1/filestmp.tar -C /paks/$1/ROOT
tar xvf /paks/$1/conftmp.tar -C /paks/$1/CONF
rm -f /paks/$1/{files,conf}tmp.tar
cd /paks/$1/ROOT && tar cvfz /paks/$1/files.tgz *
cd /paks/$1/CONF && tar cvfz /paks/$1/conf.tgz *
cd /paks/$1 && tar cvfz ../$2.tar.gz files.tgz conf.tgz install.sh uninstall.sh cd /paks/$1 && tar cvfz ../$2.tar.gz files.tgz conf.tgz install.sh uninstall.sh
cd .. && md5sum $2.tar.gz >> $2.tar.gz.md5 cd .. && md5sum $2.tar.gz >> $2.tar.gz.md5