[Olsr-dev] [PATCH RFC v1 3/4] smart gateway: install default speed configuration file

[Hans-Christoph Steiner]

Ah right, sorry, I misread that.  It seems to me a little messy to have 'make install' install extra config files.  For Debian (and probably other GNU/Linuxes), the normal way to do that would be to include the extra config files in /usr/share/doc/olsrd/examples, then explain the other config files in the documentation.

Or is this a second config file?  In which case, why not just include these settings in the main olsrd.conf?

That's my two bits.

.hc

On May 10, 2012, at 12:40 PM, Ferry Huberts wrote:

> AFAIK I'm not changing the olsrd.conf, I'm adding an extra file
> 
> On 10-05-12 18:38, Hans-Christoph Steiner wrote:
>> 
>> Do you need to change the olsrd.conf that is installed by default?  That seems like something that people will probably be quite used to being a certain way, so this change might be a surprise.  On the other hand, for the Android app, Debian package and Mac OS X/Fink package that I'm working on, I install a custom olsrd.conf for each platform.
>> 
>> .hc
>> 
>> On May 10, 2012, at 11:56 AM, Ferry Huberts wrote:
>> 
>>> From: Ferry Huberts<(spam-protected)>
>>> 
>>> Signed-off-by: Ferry Huberts<(spam-protected)>
>>> ---
>>> Makefile                   |    3 ++-
>>> files/olsrd.sgw.speed.conf |   14 ++++++++++++++
>>> 2 files changed, 16 insertions(+), 1 deletions(-)
>>> create mode 100644 files/olsrd.sgw.speed.conf
>>> 
>>> diff --git a/Makefile b/Makefile
>>> index 780a35c..3ec8dea 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -129,6 +129,7 @@ install_olsrd:	install_bin
>>> 		@echo ==========================================================
>>> 		mkdir -p $(ETCDIR)
>>> 		-cp -i files/olsrd.conf.default.lq $(CFGFILE)
>>> +		-cp -i files/olsrd.sgw.speed.conf $(ETCDIR)/
>>> 		@echo -------------------------------------------
>>> 		@echo Edit $(CFGFILE) before running olsrd!!
>>> 		@echo -------------------------------------------
>>> @@ -147,7 +148,7 @@ ifneq ($(MANDIR),)
>>> 		rm -f $(MANDIR)/man8/$(EXENAME).8.gz
>>> 		rmdir -p --ignore-fail-on-non-empty $(MANDIR)/man8/
>>> endif
>>> -		rm -f $(CFGFILE)
>>> +		rm -f $(CFGFILE) $(ETCDIR)/olsrd.sgw.speed.conf
>>> 		rmdir -p --ignore-fail-on-non-empty $(ETCDIR)
>>> 
>>> tags:
>>> diff --git a/files/olsrd.sgw.speed.conf b/files/olsrd.sgw.speed.conf
>>> new file mode 100644
>>> index 0000000..ae795d8
>>> --- /dev/null
>>> +++ b/files/olsrd.sgw.speed.conf
>>> @@ -0,0 +1,14 @@
>>> +#
>>> +# OLSrd Smart Gateway uplink speed configuration file
>>> +#
>>> +
>>> +
>>> +#
>>> +# Upstream speed in kilobit/s
>>> +# Default: 128
>>> +#upstream=128
>>> +
>>> +#
>>> +# Downstream speed in kilobit/s
>>> +# Default: 1024
>>> +#downstream=1024
>>> --
>>> 1.7.7.6
>>> 
>>> 
>>> --
>>> Olsr-dev mailing list
>>> (spam-protected)
>>> https://lists.olsr.org/mailman/listinfo/olsr-dev
> 
> -- 
> Ferry Huberts