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

Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2016-07-29 18:58:56 +02:00
parent 9a300ee8b5 0c265f5717
commit 65a61d88c8
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/backup/includes/nginx
View File

@@ -1 +1 @@
/etc/nginx/nginx.conf /etc/nginx

1
config/rootfiles/packages/nginx
View File

@@ -20,5 +20,6 @@ usr/share/nginx
usr/share/nginx/html usr/share/nginx/html
usr/share/nginx/html/50x.html usr/share/nginx/html/50x.html
usr/share/nginx/html/index.html usr/share/nginx/html/index.html
var/ipfire/backup/addons/includes/nginx
var/log/nginx var/log/nginx
var/spool/nginx var/spool/nginx

23
lfs/nginx
View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 1.6.2 VER = 1.8.1
THISAPP = nginx-$(VER) THISAPP = nginx-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nginx PROG = nginx
PAK_VER = 4 PAK_VER = 5
############################################################################### ###############################################################################
# Top-level Rules # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = d1b55031ae6e4bce37f8776b94d8b930 $(DL_FILE)_MD5 = 2e91695074dbdfbf1bcec0ada9fda462
install : $(TARGET) install : $(TARGET)
@@ -88,13 +88,26 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--error-log-path=/var/log/nginx/error.log \ --error-log-path=/var/log/nginx/error.log \
--user=nobody \ --user=nobody \
--group=nobody \ --group=nobody \
--with-imap --with-imap_ssl_module --with-http_ssl_module \ --with-imap \
--with-imap_ssl_module \
--with-http_ssl_module \
--with-http_gunzip_module \
--with-http_gzip_static_module \
--with-http_random_index_module \
--with-http_secure_link_module \
--with-http_degradation_module \
--with-http_stub_status_module \ --with-http_stub_status_module \
--with-http_dav_module \ --with-http_dav_module \
--with-http_sub_module --with-http_sub_module \
--with-pcre
cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
mkdir -p /var/log/nginx /var/spool/nginx mkdir -p /var/log/nginx /var/spool/nginx
cp /usr/src/config/nginx/nginx /etc/init.d/ cp /usr/src/config/nginx/nginx /etc/init.d/
# Backup
install -v -m 644 $(DIR_SRC)/config/backup/includes/nginx \
/var/ipfire/backup/addons/includes/nginx
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

1
src/paks/nginx/uninstall.sh
View File

@@ -23,6 +23,7 @@
# #
. /opt/pakfire/lib/functions.sh . /opt/pakfire/lib/functions.sh
stop_service ${NAME} stop_service ${NAME}
extract_backup_includes
make_backup ${NAME} make_backup ${NAME}
remove_files remove_files