Merge branch 'hotfix-1.1.1' into development
This commit is contained in:
Matthias Strubel
commit
d352115b71
|
|
@ -1,5 +1,11 @@
|
|||
CHANGELOG
|
||||
|
||||
=== 1.1.1 ===
|
||||
* [Fix] Translation en,fr LibraryBox -> PirateBox
|
||||
* [Fix] Spellings in translation
|
||||
* [Fix] IRC startup command failed.
|
||||
* [Removed] exchange_www.sh
|
||||
|
||||
=== 1.1.0 ===
|
||||
* [New] Enable / Disable file provisioning for custom lighttpd directory listing
|
||||
* [New] ChatBox message is now in conf/chat_init.txt
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -1,5 +1,5 @@
|
|||
NAME = piratebox-ws
|
||||
VERSION = 1.1.0
|
||||
VERSION = 1.1.1
|
||||
ARCH = all
|
||||
PB_FOLDER=piratebox
|
||||
PB_SRC_FOLDER=$(PB_FOLDER)/$(PB_FOLDER)
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
#!/bin/sh
|
||||
# Matthias Strubel , 2013-2015 (c) GPL-3
|
||||
# matthias.strubel@aod-rpg.de
|
||||
|
||||
|
||||
## This is an obsolete feature.
|
||||
## we exit that stuff only and skip processing it.
|
||||
## In 99% this breaks stuff, over helping you.
|
||||
## Will be removed with the next full release.
|
||||
|
||||
echo "exchange_www.sh - was deactivated and does nothing now."
|
||||
echo " Will be removed with the next full release."
|
||||
exit 0
|
||||
|
||||
|
||||
# Move www folder to given destination
|
||||
|
||||
# Load configfile
|
||||
|
||||
if [ -z $1 ] || [ -z $2 ]; then
|
||||
echo "Usage change_www my_config <destination>
|
||||
i.e. # exchange_www.sh /opt/piratebox/conf/piratebox.conf /mnt/usb/PirateBox/www_alt "
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
if [ ! -f $1 ] ; then
|
||||
echo "Config-File $1 not found..."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#Load config
|
||||
. $1
|
||||
|
||||
echo "----------------------------------------------------"
|
||||
echo "#### $2 ####"
|
||||
echo "#### switching directories ####"
|
||||
echo "----------------------------------------------------"
|
||||
|
||||
mv $WWW_FOLDER $PIRATEBOX_FOLDER/www_old
|
||||
ln -sf $2 $WWW_FOLDER
|
||||
echo " Copy over >>fake internet detection-stuff<<"
|
||||
cp -v $PIRATEBOX_FOLDER/www_old/ncsi.txt $WWW_FOLDER
|
||||
cp -rv $PIRATEBOX_FOLDER/www_old/library $WWW_FOLDER
|
||||
echo " Copy over >>redirect.html<< for automatic redirect on wrong entered page<<"
|
||||
cp -v $PIRATEBOX_FOLDER/www_old/redirect.html $WWW_FOLDER
|
||||
echo " Done. Now, you are on your own! "
|
||||
|
|
@ -186,6 +186,12 @@ LIGHTTPD_GROUP=nogroup
|
|||
|
||||
#Switch to yes if you want to enable the IRC-Server
|
||||
ENABLE_IRC_SERVER="no"
|
||||
IRC_USER="$LIGHTTPD_USER"
|
||||
|
||||
## If you want to save rooms and so on, create the folder
|
||||
# /opt/piratebox/share/IRC_STATE and make sure it is writeable
|
||||
# for IRC_USER (nobody per default)
|
||||
#IRC_STATE_DIR="$SHARE_FOLDER/IRC_STATE"
|
||||
|
||||
#------------------------ Hook in user-config
|
||||
. $PIRATEBOX_FOLDER/conf/hook_custom.conf
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ case "$1" in
|
|||
find $PIRATEBOX/tmp/ -exec rm {} \;
|
||||
|
||||
if [ "$CUSTOM_DIRLIST_COPY" = "yes" ]; then
|
||||
echo "Copy over design files"
|
||||
echo "Copy over directory design files"
|
||||
$PIRATEBOX/bin/distribute_files.sh $SHARE_FOLDER/Shared
|
||||
fi
|
||||
|
||||
|
|
@ -200,10 +200,10 @@ case "$1" in
|
|||
|
||||
. $CONF_IRC
|
||||
|
||||
IRC_PARMS="--daemon --motd $IRC_MOTD "
|
||||
IRC_PARMS="--setuid $IRC_USER --daemon --motd '$IRC_MOTD' "
|
||||
|
||||
if [ ! -z $STATEDIR ] ; then
|
||||
IRC_PARMS=" $IRCPARMS --statedir $STATEDIR "
|
||||
if [ ! -z "$IRC_STATEDIR" ] ; then
|
||||
IRC_PARMS=" $IRCPARMS --statedir '$IRC_STATEDIR' "
|
||||
fi
|
||||
|
||||
log_daemon_msg "Starting Miniircd..."
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ case "$1" in
|
|||
find $PIRATEBOX/tmp/ -exec rm {} \;
|
||||
|
||||
if [ "$CUSTOM_DIRLIST_COPY" = "yes" ]; then
|
||||
echo "Copy over design files"
|
||||
echo "Copy over directory design files"
|
||||
$PIRATEBOX/bin/distribute_files.sh $SHARE_FOLDER/Shared
|
||||
fi
|
||||
|
||||
|
|
@ -192,10 +192,10 @@ case "$1" in
|
|||
#Start IRC Server
|
||||
if [ "$ENABLE_IRC_SERVER" = "yes" ] ; then
|
||||
. $CONF_IRC
|
||||
IRC_PARMS="--daemon --motd $IRC_MOTD "
|
||||
IRC_PARMS="--setuid $IRC_USER --daemon --motd '$IRC_MOTD' "
|
||||
|
||||
if [ ! -z $STATEDIR ] ; then
|
||||
IRC_PARMS=" $IRCPARMS --statedir $STATEDIR "
|
||||
if [ ! -z "$IRC_STATEDIR" ] ; then
|
||||
IRC_PARMS=" $IRCPARMS --statedir '$IRC_STATEDIR' "
|
||||
fi
|
||||
echo "Starting Miniircd..."
|
||||
start-stop-daemon $DROOPY_USER -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS
|
||||
|
|
|
|||
|
|
@ -35,5 +35,5 @@ mainShoutboxRed = Red
|
|||
footerBackToTop = Back to top
|
||||
footerAbout = About
|
||||
footerInspired = Inspired by pirate radio and the free culture movement, PirateBox is a self-contained mobile collaboration and file sharing device. PirateBox utilizes Free, Libre and Open Source software (FLOSS) to create mobile wireless file sharing networks where users can anonymously share images, video, audio, documents, and other digital content.
|
||||
footerFilesTopSafety = LibraryBox is designed to be safe and secure. No logins are required and no user data is logged. The system is purposely not connected to the Internet in order to prevent tracking and preserve user privacy.
|
||||
footerFilesTopSafety = PirateBox is designed to be safe and secure. No logins are required and no user data is logged. The system is purposely not connected to the Internet in order to prevent tracking and preserve user privacy.
|
||||
footerLicenceMain = PirateBox is licensed under GPLv3.
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ sidebarIframeNotSupported = Votre navigateur ne supporte pas les iframes. Si vou
|
|||
sidebarBrowseFiles = Parcourir les fichiers ->
|
||||
|
||||
diskUsage = Espace de stockage
|
||||
refreshButton.value = Rafra chir
|
||||
refreshButton.value = Rafraichir
|
||||
refreshButton.title = Le taux d'utilisation du disque ne peut être rafraîchi que toutes les 5 minutes
|
||||
|
||||
mainChatChat = Chat
|
||||
|
|
@ -35,5 +35,5 @@ mainShoutboxRed = Rouge
|
|||
footerBackToTop = Vers le haut
|
||||
footerAbout = À propos
|
||||
footerInspired = Inspiré par les radios pirate et le mouvement de la culture libre, PirateBox est un dispositif mobile autonome de collaboration et de partage de fichiers. PirateBox utilise des logiciels libres pour créer des réseaux mobiles sans fils de partage de fichiers dont les utilisateurs peuvent partager de manière anonyme des images, des vidéos, de l'audio, des documents ou tout autre contenu numérique.
|
||||
footerFilesTopSafety = LibraryBox est conçue pour être sûre et sécurisée. Aucun compte utilisateur n'est requis et aucune donnée utilisateur n'est sauvegardée. Le système n'est volontairement pas connecté à Internet afin de prévenir toute tentative de suivi et de préserver la vie privée de ses utilisateurs.
|
||||
footerFilesTopSafety = PirateBox est conçue pour être sûre et sécurisée. Aucun compte utilisateur n'est requis et aucune donnée utilisateur n'est sauvegardée. Le système n'est volontairement pas connecté à Internet afin de prévenir toute tentative de suivi et de préserver la vie privée de ses utilisateurs.
|
||||
footerLicenceMain = PirateBox est distribuée sous licence GPLv3.
|
||||
|
|
|
|||
Loading…
Reference in New Issue