piratebox-mirror
/
PirateBoxScripts_Webserver
mirror of https://github.com/PirateBox-Dev/PirateBoxScripts_Webserver.git
2
1
Fork 0
Code Issues Releases Wiki Activity

Fixes & new version numbering

This commit is contained in:
Matthias Strubel 2015-02-18 08:08:55 +01:00
parent 8e3359608b
commit a20fb789ff
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -1,5 +1,5 @@
NAME = piratebox-ws
VERSION = 1.1.0
VERSION = 2.0.0-alpha1
ARCH = all
PB_FOLDER=piratebox
PB_SRC_FOLDER=$(PB_FOLDER)/$(PB_FOLDER)
@ -8,8 +8,8 @@ PACKAGE_NAME=$(NAME)_$(VERSION)
PACKAGE=$(PACKAGE_NAME).tar.gz
VERSION_FILE=$(PB_FOLDER)/$(PB_FOLDER)/version
IMAGE_FILE=piratebox_ws_1.1_img.gz
TGZ_IMAGE_FILE=piratebox_ws_1.1_img.tar.gz
IMAGE_FILE=piratebox_ws_2.0_img.gz
TGZ_IMAGE_FILE=piratebox_ws_2.0_img.tar.gz
SRC_IMAGE=image_stuff/OpenWRT_ext4_50MB.img.gz
SRC_IMAGE_UNPACKED=image_stuff/piratebox_img
MOUNT_POINT=image_stuff/image
@ -56,15 +56,15 @@ $(IMAGE_FILE): $(IRC_TARGET_SERVER) $(VERSION) $(SRC_IMAGE_UNPACKED) $(OPENWRT_C
$(OPENWRT_CONFIG_FOLDER):
mkdir -p $@
mkdir -p $@/modules_conf
cp -rv $(PB_SRC_FOLDER)/conf/* $@
sed 's:OPENWRT="no":OPENWRT="yes":' -i $@/piratebox.conf
sed 's:DO_IFCONFIG="yes":DO_IFCONFIG="no":' -i $@/piratebox.conf
sed 's:IPV6_ENABLE="no":IPV6_ENABLE="yes":' -i $@/ipv6.conf
sed 's:USE_APN="yes":USE_APN="no":' -i $@/piratebox.conf
sed 's:DNSMASQ_INTERFACE="wlan0":DNSMASQ_INTERFACE="br-lan":' -i $@/piratebox.conf
sed 's:192.168.77:192.168.1:g' -i $@/piratebox.conf
sed 's:DROOPY_USE_USER="yes":DROOPY_USE_USER="no":' -i $@/piratebox.conf
sed 's:LEASE_FILE_LOCATION=$$PIRATEBOX_FOLDER/tmp/lease.file:LEASE_FILE_LOCATION=/tmp/lease.file:' -i $@/piratebox.conf
sed 's:DNSMASQ_INTERFACE="":DNSMASQ_INTERFACE="br-lan":' -i $@/modules_conf/dnsmasq.conf
sed 's:192.168.77:192.168.1:g' -i $@/modules_conf/network.conf
sed 's:DROOPY_USE_USER="yes":DROOPY_USE_USER="no":' -i $@/modules_conf/droopy.conf
sed 's:LEASE_FILE_LOCATION=$$PIRATEBOX_FOLDER/tmp/lease.file:LEASE_FILE_LOCATION=/tmp/lease.file:' -i $@/modules_conf/dnsmasq.conf
sed 's:hostap::' -i $@/default_modules.conf
sed 's:network::' -i $@/default_modules.conf
$(OPENWRT_BIN_FOLDER):
mkdir -p $@

2
piratebox/piratebox/conf/modules_conf/dnsmasq.conf
View File

@ -8,7 +8,7 @@ START_LEASE=10
#DHCP LEASE End Range
END_LEASE=250
#Leasetime (When should the client renew it's IP)
LEASE_DURATION=12h
LEASE_DURATION=1h
# Where is the leasefile stored to?
LEASE_FILE_LOCATION=$PIRATEBOX_FOLDER/tmp/lease.file

1
piratebox/piratebox/modules.available/generate_config_lighttpd_env
View File

@ -34,6 +34,7 @@ func_generate_config_lighttpd_env_start(){
}
func_generate_config_lighttpd_env_stop(){
local RC=0
_check_rc_ "$generate_config_lighttpd_env_myself" "$RC"
return $RC
}