summaryrefslogtreecommitdiff
path: root/config/obr
diff options
context:
space:
mode:
Diffstat (limited to 'config/obr')
-rw-r--r--config/obr/dhcpd.conf17
-rw-r--r--config/obr/joe/ftyperc68
-rw-r--r--config/obr/joe/joerc1349
-rw-r--r--config/obr/joe/jstarrc26
-rw-r--r--config/obr/nsd-external/zones/maschezuoz.ch3
-rw-r--r--config/obr/nsd-internal/zones/1.168.192.in-addr7
-rw-r--r--config/obr/nsd-internal/zones/lan5
-rw-r--r--config/obr/nsd-internal/zones/maschezuoz.ch3
-rw-r--r--config/obr/ntpd.conf4
-rw-r--r--config/obr/pf.conf8
-rw-r--r--config/obr/relayd.conf29
-rw-r--r--config/obr/unbound/etc/root.hints52
12 files changed, 1502 insertions, 69 deletions
diff --git a/config/obr/dhcpd.conf b/config/obr/dhcpd.conf
index ebaa745..79688de 100644
--- a/config/obr/dhcpd.conf
+++ b/config/obr/dhcpd.conf
@@ -93,7 +93,7 @@ shared-network LAN {
}
host euromac {
- hardware ethernet 00:1c:b3:c3:74:8c;
+ hardware ethernet 00:1b:63:9f:43:0c;
fixed-address 192.168.1.20;
}
@@ -101,5 +101,20 @@ shared-network LAN {
hardware ethernet b8:27:eb:15:62:14;
fixed-address 192.168.1.21;
}
+
+ host eurobuild6 {
+ hardware ethernet 00:00:1c:b6:26:37;
+ fixed-address 192.168.1.22;
+ }
+
+ host eurobuild7 {
+ hardware ethernet 00:0E:2E:05:BF:88;
+ fixed-address 192.168.1.23;
+ }
+
+ host eurotv {
+ hardware ethernet B8:27:EB:A0:10:58;
+ fixed-address 192.168.1.24;
+ }
}
}
diff --git a/config/obr/joe/ftyperc b/config/obr/joe/ftyperc
index 77c2230..fc2cdaf 100644
--- a/config/obr/joe/ftyperc
+++ b/config/obr/joe/ftyperc
@@ -85,6 +85,7 @@
[mason]
*.mas
-autoindent
+-title
-syntax mason
-smarthome
-smartbacks
@@ -93,6 +94,7 @@
[sml]
*.sml
-autoindent
+-title
-syntax sml
-smarthome
-smartbacks
@@ -104,6 +106,7 @@
OCaml language interface
*.mli
-autoindent
+-title
-syntax ocaml
-smarthome
-smartbacks
@@ -120,6 +123,7 @@
*Guardfile
*.rabl
-autoindent
+-title
-pound_comment
-syntax ruby
-text_delimiters do=end
@@ -132,6 +136,7 @@
*.pm
*.t
-autoindent
+-title
-syntax perl
-smarthome
-smartbacks
@@ -142,6 +147,7 @@
[sql]
*.sql
-autoindent
+-title
-syntax sql
-smarthome
-smartbacks
@@ -157,6 +163,7 @@
[awk]
*.awk
-autoindent
+-title
-syntax awk
-smarthome
-smartbacks
@@ -167,6 +174,7 @@
[yacc]
*.y
-autoindent
+-title
-syntax c
-highlighter_context
-smarthome
@@ -183,6 +191,7 @@
*.l
*.lex
-autoindent
+-title
-syntax c
-highlighter_context
-smarthome
@@ -200,6 +209,7 @@
*.ads
-syntax ada
-autoindent
+-title
-istep 2
-smarthome
-smartbacks
@@ -221,6 +231,7 @@
+#![ ]*[^\n]*rexx[0-9.]*\>
-syntax rexx
-autoindent
+-title
SED script
[sed]
@@ -247,6 +258,7 @@
*.hh
*.mm
-autoindent
+-title
-syntax c
-highlighter_context
-smarthome
@@ -330,6 +342,7 @@
[java]
*.java
-autoindent
+-title
-syntax java
-smarthome
-smartbacks
@@ -344,6 +357,7 @@
*
+#![ ]*[^\n]*nodejs[0-9.]*\>
-autoindent
+-title
-syntax js
-smarthome
-smartbacks
@@ -364,6 +378,7 @@
[typescript]
*.ts
-autoindent
+-title
-syntax typescript
-smarthome
-smartbacks
@@ -376,6 +391,7 @@
[php]
*.php
-autoindent
+-title
-syntax php
-smarthome
-smartbacks
@@ -387,6 +403,7 @@
+#![ ]*[^\n]*python[0-9.]*\>
*.py
-autoindent
+-title
-syntax python
-highlighter_context
-smarthome
@@ -406,6 +423,7 @@
*.tcsh
*.tcshrc
-autoindent
+-title
-syntax csh
-pound_comment
@@ -421,6 +439,7 @@
*.bash_login
*.bash_logout
-autoindent
+-title
-syntax sh
-highlighter_context
-pound_comment
@@ -432,6 +451,7 @@
*.lsp
*.el
-autoindent
+-title
-syntax lisp
-semi_comment
@@ -441,6 +461,7 @@
+#![ ]*[^\n ]*/ksh\>
*.ksh
-autoindent
+-title
-syntax sh
-highlighter_context
-pound_comment
@@ -451,19 +472,21 @@
*.p
*.pas
-autoindent
+-title
-syntax pascal
-smarthome
-smartbacks
-purify
-text_delimiters begin|BEGIN|record|RECORD|case|CASE=end|END:repeat|REPEAT=until|UNTIL
- Fortral
+ Fortran
[fortran]
*.f
*.f90
*.for
*.FOR
-autoindent
+-title
-syntax fortran
Cadence SKILL
@@ -472,6 +495,7 @@
-semi_comment
-syntax skill
-autoindent
+-title
-istep 3
-indentc 32
-smartbacks
@@ -484,18 +508,21 @@
*
+#![ ]*[^\n]*lua[0-9.]*\>
-autoindent
+-title
-syntax lua
TCL
[tcl]
*.tcl
-autoindent
+-title
-syntax tcl
Go language
[go]
*.go
-autoindent
+-title
-syntax go
-smarthome
-smartbacks
@@ -509,6 +536,7 @@
[c#]
*.cs
-autoindent
+-title
-syntax csharp
-smarthome
-smartbacks
@@ -521,6 +549,7 @@
*.jsf
*.jsf.in
-autoindent
+-title
-syntax jsf
-smarthome
@@ -529,6 +558,7 @@
*.ac
*.m4
-autoindent
+-title
-syntax m4
Matlab file (clashes with objective-C)
@@ -647,12 +677,14 @@
*.erlang
-syntax erlang
-autoindent
+-title
Sieve (ManageSieve)
[sieve]
*.sieve
-syntax sieve
-autoindent
+-title
Puppet
[puppet]
@@ -660,6 +692,7 @@
-syntax puppet
-pound_comment
-autoindent
+-title
ip(6)tables
[iptables]
@@ -672,7 +705,11 @@
PowerShell
[powershell]
*.ps1
+*.psm1
-syntax powershell
+-autoindent
+-smarthome
+-smartbacks
Git COMMIT_EDITMSG
[git-commit]
@@ -684,14 +721,20 @@
*.ex
*.exs
-autoindent
+-smarthome
+-smartbacks
+-title
-syntax elixir
-pound_comment
--text_delimiters do=end
+-text_delimiters do=else=end
+-indentc 32
+-istep 2
R
[r]
*.r
-autoindent
+-title
-syntax r
-pound_comment
-smarthome
@@ -706,6 +749,7 @@
*.gy
*.gsh
-autoindent
+-title
-syntax groovy
-c_comment
-cpp_comment
@@ -721,6 +765,7 @@
*.cljc
*.edn
-autoindent
+-title
-syntax clojure
-semi_comment
-smarthome
@@ -731,6 +776,7 @@
[rust]
*.rs
-autoindent
+-title
-syntax rust
-c_comment
-cpp_comment
@@ -743,6 +789,7 @@
[coffee]
*.coffee
-autoindent
+-title
-syntax coffee
-pound_comment
-smarthome
@@ -754,6 +801,7 @@
[scala]
*.scala
-autoindent
+-title
-syntax scala
-c_comment
-cpp_comment
@@ -766,6 +814,7 @@
[swift]
*.swift
-autoindent
+-title
-syntax swift
-c_comment
-cpp_comment
@@ -778,6 +827,7 @@
[d]
*.d
-autoindent
+-title
-syntax d
-c_comment
-cpp_comment
@@ -785,3 +835,17 @@
-smartbacks
-purify
-single_quoted
+
+ Docker
+[dockerfile]
+*Dockerfile
+-autoindent
+-title
+-syntax dockerfile
+-pound_comment
+
+ RPM Spec
+[spec]
+*.spec
+-autoindent
+-syntax spec
diff --git a/config/obr/joe/joerc b/config/obr/joe/joerc
new file mode 100644
index 0000000..49c09a0
--- /dev/null
+++ b/config/obr/joe/joerc
@@ -0,0 +1,1349 @@
+ Initialization file for JOE
+ Standard Joe
+
+ JOE looks for this file in:
+ 1 - $HOME/.joerc
+ 2 - /etc/joe/joerc
+
+ This file can include other files by placing the following include command
+ in the first column:
+
+ :include filename
+
+ FIRST SECTION: Default global options (these options can also be specified
+ on the command line. Also the NOXON, LINES, COLUMNS, DOPADDING and BAUD
+ options can be specified in environment variables):
+
+ Override colors of lexical classes specified in syntax files:
+ Put each color override you want in the first column.
+
+ Valid colors:
+ bold inverse blink dim underline italic
+ white cyan magenta blue yellow green red black
+ bg_white bg_cyan bg_magenta bg_blue bg_yellow bg_green bg_red bg_black
+
+ Other colors are available: see syntax/c.jsf for documentation.
+
+ Override all instances of class Idle:
+ =Idle red
+
+ Override Idle only for c syntax file:
+ =c.Idle red
+
+ The following list is from c.jsf. Look at other syntax files for more classes.
+
+ =Idle
+ =Bad bold red
+ =Preproc blue
+ =Define bold blue
+ =IncLocal cyan
+ =IncSystem bold cyan
+ =Constant cyan
+ =Escape bold cyan
+ =Type bold
+ =Keyword bold
+ =CppKeyword bold
+ =Brace magenta
+ =Control
+
+ Put each option you want set in the first column:
+
+ -option Sets the option
+ --option Clears the option
+
+ -help_is_utf8 Set if help text is in UTF-8 format. Leave clear if it's a raw 8-bit format.
+
+ -mid Cursor is recentered when scrolling is necessary
+ -left nn Amount to jump left when scrolling is necessary (-1 for 1/4 width)
+ -right nn Amount to jump right when scrolling is necessary (-1 for 1/4 width)
+
+ -marking Text between ^KB and cursor is highlighted (use with -lightoff)
+
+ -asis Characters 128 - 255 shown as-is
+
+ -force Force final newline when files are saved
+
+ -nolocks If you don't want file locks to be used
+
+ -nomodcheck Disable periodic checking of disk file newer than buffer
+ (this checking happens on save even with this option).
+
+ -nocurdir Do not prompt with current directory
+
+ -nobackups If you don't want backup files to be created
+
+ -nodeadjoe If you don't want DEADJOE files to be created
+
+ -break_hardlinks
+ Delete file before writing, to break hard links
+ (but don't break symbolic links).
+
+ -break_links
+ Delete file before writing, to break hard links
+ and symbolic links.
+
+
+ -lightoff Turn off highlighting after block copy or move
+
+ -exask ^KX always confirms file name
+
+ -beep Beep on errors and when cursor goes past extremes
+
+ -nosta Disable top-most status line
+
+-keepup %k and %c status line escape sequences updated frequently
+
+ -pg nnn No. lines to keep for PgUp/PgDn
+
+ -undo_keep nnn Number of undo records to keep. 0 for infinite.
+
+ -csmode ^KF after a pervious search does a ^L instead
+
+ -backpath path
+ Directory to store backup files (one space between
+ 'backpath' and the 'path', no trailing spaces or comments
+ after the path).
+
+ -floatmouse Clicking past end of line moves the cursor past the end
+
+ -rtbutton Use the right mouse button for action, instead of the left
+
+ -nonotice Disable copyright notice
+
+ -noexmsg Disable exiting message ("File not changed so no update needed")
+
+-noxon Attempt to turn off ^S/^Q processing
+
+ -orphan Put extra files given on command line in orphaned buffers
+ instead of in windows
+
+ -dopadding Output pad characters (for when there is no tty handshaking)
+
+ -lines nnn Set no. screen lines
+
+ -baud nnn Set baud rate for terminal optimizations
+
+ -columns nnn Set no. screen columns
+
+ -helpon Start with help on
+
+ -skiptop nnn Don't use top nnn lines of the screen
+
+-notite Don't send terminal initialization and termination strings:
+ prevents restoration of screen on exit.
+
+ -nolinefeeds Prevent sending linefeeds to preserve screen history in terminal
+ emulator's scroll-back buffer.
+
+ -usetabs Use tabs to help optimize screen update.
+
+-assume_color Assume terminal has ANSI color support even if termcap/terminfo entry
+ says that it doesn't. This only applies if the terminal otherwise
+ looks like an ANSI terminal (support bold and capability starts with
+ ESC [).
+
+-assume_256color
+ Assume terminal has xterm 256 color support (ESC [ 38 ; 5 ; NNN m and
+ ESC [ 48 ; 5 ; NNN m).
+
+-guess_non_utf8 Allow guess of non-UTF-8 file encoding in a UTF-8 locale.
+
+ -guess_utf8 Allow guess of UTF-8 file encoding in non-UTF-8 locale.
+
+-guess_utf16 Allow guess of UTF-16 encoding
+
+-guess_crlf Automatically detect MS-DOS files and set -crlf appropriately
+
+-guess_indent Guess indent character (tab or space).
+
+-menu_above Position menu/list above prompt when enabled. Otherwise position
+ below prompt.
+
+-transpose Transpose rows with columns in all menus.
+
+ -menu_explorer Stay in menu system when a directory is selected (otherwise
+ directory is added to path and menu is closed).
+
+ -menu_jump Jump into file selection menu when tab is hit (otherwise, menu
+ comes up, but cursor stays in file name prompt).
+
+ -notagsmenu Disable tags file search menu
+
+ -icase Search is case insensitive by default.
+
+ -wrap Search wraps
+
+ -autoswap Swap markb with markk when necessary
+
+-joe_state Use ~/.joe_state file
+
+ -mouse Enable xterm mouse support. When enabled, left-click will
+ position the cursor and left-click-drag will select blocks
+ For normal xterm cut and paste, hold the shift key down.
+
+ -joexterm If you are using XTerm version 212 or higher, and if it was
+ configured with --enable-paste64, set this flag: it allows
+ mouse cut & paste to work properly (text selected with the
+ mouse can be pasted into other application, and middle
+ button clicks paste into JOE).
+
+-brpaste When JOE starts, send command to the terminal emulator that
+ enables "bracketed paste mode" (but only if the terminal
+ seems to have the ANSI command set). In this mode, text
+ pasted into the window is bracketed with ESC [ 2 0 0 ~ and
+ ESC [ 2 0 1 ~.
+
+-pastehack If keyboard input comes in as one block assume it's a mouse
+ paste and disable autoindent and wordwrap.
+
+ -square Rectangular block mode
+
+ -text_color color
+ Set color for text.
+ -status_color color
+ Set color for status bar.
+ -help_color color
+ Set color for help.
+ -menu_color color
+ Set color for menus.
+ -prompt_color color
+ Set color for prompts.
+ -msg_color color
+ Set color for messages.
+
+ For example: -text_color bg_blue+white
+ Sets the background color to blue and foreground color to white.
+
+-restore Restore previous cursor position when files are opened
+
+-search_prompting
+ Search prompts with previous search request.
+
+ -regex Search uses standard regular expression format (otherwise it uses
+ JOE format where all special characters have to be escaped).
+
+ Status line definition strings. -lmsg defines the left-justified string and
+ -rmsg defines the right-justified string. The first character of -rmsg is
+ the background fill character. The following escape sequences can be used
+ in these strings:
+
+ %t 12 hour time
+ %u 24 hour time
+ %T O for overtype mode, I for insert mode
+ %W W if wordwrap is enabled
+ %I A if autoindent is enabled
+ %X Rectangle mode indicator
+ %n File name
+ %m '(Modified)' if file has been changed
+ %* '*' if file has been changed
+ %R Read-only indicator
+ %r Row (line) number
+ %c Column number
+ %o Byte offset into file
+ %O Byte offset into file in hex
+ %a Ascii value of character under cursor
+ %A Ascii value of character under cursor in hex
+ %w Width of character under cursor
+ %p Percent of file cursor is at
+ %l No. lines in file
+ %k Entered prefix keys
+ %S '*SHELL*' if there is a shell running in window
+ %M Macro recording message
+ %y Syntax
+ %e Encoding of file
+ %b Encoding of terminal
+ %x Context (first non-indented line going backwards)
+ %dd day
+ %dm month
+ %dY year
+ %Ename% value of environment variable
+ %Zname% value of option (ON or OFF for boolean options)
+ (hit TAB at mode command prompt for full list)
+
+ These formatting escape sequences may also be given:
+
+ \i Inverse
+ \u Underline
+ \b Bold
+ \d Dim
+ \f Blink
+ \l Italic
+
+-lmsg \i%k%T%W%I%X %n %m%y%R %M %x
+-rmsg %S Row %4r Col %3c
+-smsg ** Line %r Col %c Offset %o(0x%O) %e %a(0x%A) Width %w **
+-zmsg ** Line %r Col %c Offset %o(0x%O) **
+-xmsg \i Joe's Own Editor %v (%b) ** Type \bCtrl-K Q\b to exit or \bCtrl-K H\b for help **\i
+
+ Key sequence hints which are displayed in various prompts.
+-aborthint ^C
+-helphint ^K H
+
+ SECOND SECTION: File name dependant local option settings:
+
+ Name a file type definition section with:
+
+ [python] (but put opening bracket in first column)
+
+ Each line with '*' in the first column provides a file name matching
+ regular expression (in shell glob format). If more than one regular
+ expression matches the file name, then the last matching one is chosen.
+
+ A file contents regular expression may also be specified on a separate line
+ with '+regex'. If this regular expresssion is given, then both the file name
+ regex and the file contents regex must match for the options to apply.
+
+ Here are the modes which can be set:
+
+ -cpara >#!;*/%
+ Characters which can indent paragraphs.
+
+ -cnotpara .
+ Characters which begin non-paragraph lines.
+
+ -encoding name
+ Set file coding (for example: utf-8, iso-8859-15)
+
+ -syntax name
+ Specify syntax (syntax file called
+ 'name.jsf' will be loaded)
+
+ -hex Hex editor mode
+
+ -highlight Enable highlighting
+
+ -smarthome Home key first moves cursor to beginning of line,
+ then if hit again, to first non-blank character.
+
+ -indentfirst Smart home goes to first non-blank character first,
+ instead of going the beginning of line first.
+
+ -smartbacks Backspace key deletes 'istep' number of
+ 'indentc's if cursor is at first non-space
+ character.
+
+ -tab nnn Tab width
+
+ -indentc nnn Indentation character (32 for space, 9 for tab)
+
+ -istep nnn Number of indentation columns
+
+ -spaces TAB inserts spaces instead of tabs.
+
+ -purify Fix indentation if necessary for rindent, lindent and backs
+ (for example if indentation uses a mix of tabs and spaces,
+ and indentc is space, indentation will be converted to all
+ spaces).
+
+ -crlf File uses CR-LF at ends of lines
+
+ -wordwrap Wordwrap
+
+ -nobackup If you don't want backup file to be created
+
+ -autoindent Auto indent
+
+ -overwrite Overtype mode
+
+ -picture Picture mode (right arrow can go past end of lines)
+
+ -lmargin nnn Left margin
+
+ -rmargin nnn Right margin
+
+ -flowed Put one space after intermediate paragraph lines
+ for support of flowed text.
+
+
+ -french One space after '.', '?' and '!' for wordwrap
+ and paragraph reformat instead of two. Joe
+ does not change the spacing you give, but
+ sometimes it must put spacing in itself. This
+ selects how much is inserted.
+
+ -linums Enable line numbers on each line
+
+ -rdonly File is read-only
+
+ -keymap name
+ Keymap to use if not 'main'
+
+ -lmsg Status line definition strings-
+ -rmsg see previous section for more info.
+
+ -mfirst macro
+ Macro to execute on first modification
+ -mnew macro
+ Macro to execute when new files are loaded
+ -mold macro
+ Macro to execute when existing files are loaded
+ -msnew macro
+ Macro to execute when new files are saved
+ -msold macro
+ Macro to execute when existing files are saved
+
+ Macros for the above options are in the same format as in the key
+ binding section below- but without the key name strings.
+
+ These define the language syntax for ^G (goto matching delimiter):
+
+ -highlighter_context Use the highlighter context for ^G
+
+ -single_quoted Text between ' ' should be ignored (this is
+ not good for regular text since ' is
+ normally used alone as an apostrophe)
+
+ -no_double_quoted Text between " " should not be ignored (useful
+ for TeX).
+
+ -c_comment Text between /* */ should be ignored
+
+ -cpp_comment Text after // should be ignored
+
+ -pound_comment Text after # should be ignored
+
+ -vhdl_comment Text after -- should be ignored
+
+ -semi_comment Text after ; should be ignored
+
+ -text_delimiters begin=end:if=elif=else=endif
+
+ Define word delimiters
+
+ Default local options
+-highlight
+-istep 4
+
+ Perforce macro: use this macro (put in first column) to have joe "p4 edit"
+ a file you're about to change.
+
+ -mfirst if,"rdonly && joe(sys,\"p4 edit \",name,rtn)",then,mode,"o",msg,"executed \"p4 edit ",name,"\"",rtn,endif
+
+ -mfirst if,"rdonly && joe(sys,\"p4 edit \",name,rtn)",then,reload,msg,"executed \"p4 edit ",name,"\"",rtn,endif
+
+ File type table is now in a separate file. You can copy this file to ~/.joe and customize it.
+
+:include ftyperc
+
+ SECOND and 1/2 SECTION: Option menu layout
+
+ :defmenu name [macro]
+ Defines a menu.
+ The macro here is executed when the user hits backspace.
+
+ macro string comment
+ A menu entry. Macro is any JOE macro- see "Macros:"
+ below. String is the label to be used for the macro
+ in the menu. It is in the same format as the -lmsg
+ and -rmsg options above.
+
+ Two whitespace characters in a row begins a comment.
+ Use '% ' for a leading space in the string.
+
+:defmenu root
+mode,"overwrite",rtn T Overtype %Zoverwrite%
+mode,"hex",rtn ' Hex edit mode
+mode,"autoindent",rtn I Autoindent %Zautoindent%
+mode,"wordwrap",rtn W Word wrap %Zwordwrap%
+mode,"tab",rtn D Tab width %Ztab%
+mode,"lmargin",rtn L Left margin %Zlmargin%
+mode,"rmargin",rtn R Right margin %Zrmargin%
+mode,"square",rtn X Column mode %Zsquare%
+mode,"indentc",rtn % % Indent char %Zindentc%
+mode,"istep",rtn % % Indent step %Zistep%
+menu,"indent",rtn = Indent select
+mode,"highlight",rtn H Highlighting %Zhighlight%
+mode,"crlf",rtn Z CR-LF/MS-DOS %Zcrlf%
+mode,"linums",rtn N Line numbers %Zlinums%
+mode,"beep",rtn B Beep %Zbeep%
+mode,"rdonly",rtn O Read only %Zrdonly%
+mode,"syntax",rtn Y Syntax
+mode,"encoding",rtn E Encoding
+mode,"asis",rtn % % Meta chars as-is
+mode,"language",rtn V Language
+mode,"picture",rtn P picture %Zpicture%
+mode,"type",rtn F File type [%Ztype%]
+mode,"title",rtn C Context %Ztitle%
+menu,"more-options",rtn % % More options...
+
+:defmenu more-options menu,"root",rtn
+menu,"^G",rtn % % ^G options
+menu,"search",rtn % % search options
+menu,"paragraph",rtn % % paragraph options
+menu,"file",rtn % % file options
+menu,"menu",rtn % % menu options
+menu,"global",rtn % % global options
+menu,"cursor",rtn % % cursor options
+menu,"marking",rtn % % marking options
+menu,"tab",rtn % % tab/indent options
+
+:defmenu indent menu,"root",rtn
+mode,"istep",rtn,"1",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 1, Indent character = 32",rtn 1 Space
+mode,"istep",rtn,"2",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 2, Indent character = 32",rtn 2 Spaces
+mode,"istep",rtn,"3",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 3, Indent character = 32",rtn 3 Spaces
+mode,"istep",rtn,"4",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 4, Indent character = 32",rtn 4 Spaces
+mode,"istep",rtn,"5",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 5, Indent character = 32",rtn 5 Spaces
+mode,"istep",rtn,"8",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 8, Indent character = 32",rtn 8 Spaces
+mode,"istep",rtn,"10",rtn,mode,"indentc",rtn,"32",rtn,msg,"Indent step = 10, Indent character = 32",rtn 0 Ten
+mode,"istep",rtn,"1",rtn,mode,"indentc",rtn,"9",rtn,msg,"Indent step = 1, Indent character = 9",rtn T Tab
+
+:defmenu menu menu,"more-options",rtn
+mode,"menu_explorer",rtn % % Menu explorer %Zmenu_explorer%
+mode,"menu_above",rtn % % Menu position %Zmenu_above%
+mode,"menu_jump",rtn % % Jump into menu %Zmenu_jump%
+mode,"transpose",rtn % % Transpose menus %Ztranspose%
+
+:defmenu ^G menu,"more-options",rtn
+mode,"highlighter_context",rtn % % ^G uses highlighter context %Zhighlighter_context%
+mode,"single_quoted",rtn % % ^G ignores '...' %Zsingle_quoted%
+mode,"no_double_quoted",rtn % % ^G no ignore "..." %Zno_double_quoted%
+mode,"c_comment",rtn % % ^G ignores /*...*/ %Zc_comment%
+mode,"cpp_comment",rtn % % ^G ignores //... %Zcpp_comment%
+mode,"pound_comment",rtn % % ^G ignores #... %Zpound_comment%
+mode,"vhdl_comment",rtn % % ^G ignores --... %Zvhdl_comment%
+mode,"semi_comment",rtn % % ^G ignores ;... %Zsemi_comment%
+mode,"tex_comment",rtn % % ^G ignores %%... %Ztex_comment%
+mode,"text_delimiters",rtn % % Text delimiters %Ztext_delimiters%
+
+:defmenu search menu,"more-options",rtn
+mode,"icase",rtn % % Case insensitivity %Zicase%
+mode,"wrap",rtn % % Search wraps %Zwrap%
+mode,"search_prompting",rtn % % Search prompting %Zsearch_prompting%
+mode,"csmode",rtn % % Continued search %Zcsmode%
+
+:defmenu paragraph menu,"more-options",rtn
+mode,"french",rtn % % French spacing %Zfrench%
+mode,"flowed",rtn % % Flowed text %Zflowed%
+mode,"cpara",rtn % % Paragraph indent chars %Zcpara%
+mode,"cnotpara",rtn % % Not-paragraph chars %Zcnotpara%
+
+:defmenu file menu,"more-options",rtn
+mode,"restore",rtn % % Restore cursor %Zrestore%
+mode,"guess_crlf",rtn % % Auto detect CR-LF %Zguess_crlf%
+mode,"guess_indent",rtn % % Guess indent %Zguess_indent%
+mode,"guess_non_utf8",rtn % % Guess non-UTF-8 %Zguess_non_utf8%
+mode,"guess_utf8",rtn % % Guess UTF-8 %Zguess_utf8%
+mode,"guess_utf16",rtn % % Guess UTF-16 %Zguess_utf16%
+mode,"force",rtn % % Force last NL %Zforce%
+mode,"nobackup",rtn % % No backup %Znobackup%
+
+:defmenu global menu,"more-options",rtn
+mode,"nolocks",rtn % % Disable locks %Znolocks%
+mode,"nobackups",rtn % % Disable backups %Znobackups%
+mode,"nodeadjoe",rtn % % Disable DEADJOE %Znodeadjoe%
+mode,"nomodcheck",rtn % % Disable mtime check %Znomodcheck%
+mode,"nocurdir",rtn % % Disable current dir %Znocurdir%
+mode,"exask",rtn % % Exit ask %Zexask%
+mode,"nosta",rtn % % Disable status line %Znosta%
+mode,"keepup",rtn % % Fast status line %Zkeepup%
+mode,"break_hardlinks",rtn % % Break hard links %Zbreak_hardlinks%
+mode,"break_links",rtn % % Break links %Zbreak_links%
+mode,"joe_state",rtn % % Joe_state file %Zjoe_state%
+mode,"undo_keep",rtn % % No. undo records %Zundo_keep%
+mode,"backpath",rtn % % Path to backup files %Zbackpath%
+
+:defmenu cursor menu,"more-options",rtn
+mode,"pg",rtn % % No. PgUp/PgDn lines %Zpg%
+mode,"mid",rtn C Center on scroll %Zmid%
+mode,"left",rtn L Columns to scroll left %Zleft%
+mode,"right",rtn R Columns to scroll right %Zright%
+mode,"floatmouse",rtn % % Click past end %Zfloatmouse%
+mode,"rtbutton",rtn % % Right button %Zrtbutton%
+
+:defmenu marking menu,"more-options",rtn
+mode,"autoswap",rtn % % Autoswap mode %Zautoswap%
+mode,"marking",rtn % % Marking %Zmarking%
+mode,"lightoff",rtn % % Auto unmask %Zlightoff%
+
+:defmenu tab menu,"more-options",rtn
+mode,"smarthome",rtn % % Smart home key %Zsmarthome%
+mode,"smartbacks",rtn % % Smart backspace %Zsmartbacks%
+mode,"indentfirst",rtn % % To indent first %Zindentfirst%
+mode,"purify",rtn % % Clean up indents %Zpurify%
+mode,"spaces",rtn % % No tabs %Zspaces%
+
+ THIRD SECTION: Named help screens:
+
+ Use \i to turn on/off inverse video
+ Use \u to turn on/off underline
+ Use \b to turn on/off bold
+ Use \d to turn on/off dim
+ Use \f to turn on/off flash
+ Use \l to turn on/off italic
+
+ Use \| to insert a spring: all springs in a given line are set to the same
+ width such that the entire line exactly fits in the width of the screen (if
+ it's not an exact multiple so that there are N spaces remaining, the
+ rightmost N springs each get one extra space). Hint: if you want vertical
+ alignment, each line should have the same number of springs.
+
+ Use the '-help_is_utf8' global option to allow UTF-8 sequences in the help
+ text. Otherwise, the locale 8-bit character set is assumed.
+
+{Basic
+ \|\uREGION\u \|\uGO TO\u \|\uGO TO\u \|\uDELETE\u \|\uEXIT\u \|\uSEARCH\u \|
+ \|\b^Arrow\b Select \|\b^Z\b Prev. word \|\b^U/^V\b PgUp/PgDn \|\b^D\b Char. \|\b^KX\b Save \|\b^KF\b Find \|
+ \|\b^KB\b Begin \|\b^X\b Next word \|\uMISC\u \|\b^Y\b Line \|\b^C\b Abort \|\b^L\b Next \|
+ \|\b^KK\b End \|\b^KU\b Top of file \|\b^KJ\b Paragraph \|\b^W\b >Word \|\b^KQ\b All \|\uHELP\u \|
+ \|\b^KC\b Copy \|\b^KV\b End of file \|\b^KA\b Center line \|\b^O\b Word< \|\uFILE\u \|\bEsc .\b Next\|
+ \|\b^KM\b Move \|\b^A\b Beg. of line \|\b^K Space\b Status \|\b^J\b >Line \|\b^KE\b Edit \|\bEsc ,\b Prev\|
+ \|\b^KW\b File \|\b^E\b End of line \|\uSPELL\u \|\b^[O\b Line< \|\b^KR\b Insert \|\b^KH\b Off \|
+ \|\b^KY\b Delete \|\b^KL\b To line no. \|\bEsc N\b Word \|\b^_\b Undo \|\b^KD\b Save \|\b^T\b Menu \|
+ \|\b^K/\b Filter \|\b^G\b Matching ( \|\bEsc L\b File \|\b^^\b Redo \|\b^K`\b Revert \|\b\b \|
+}
+
+{Advanced
+ \|\uMACROS\u \|\uSCROLL\u \|\uWINDOW\u \|\uGO TO\u \|\uI-SEARCH\u \|
+ \|\b^K[ 0-9\b Record \|\bEsc W\b Up \|\b^KO\b Open \b^C\b Close \|\bEsc B\b / \bK\b \|\b^R\b Backwards \|
+ \|\b^K]\b Stop \|\bEsc Z\b Down \|\b^KG\b Grow \b^KT\b Shrink \|to \b^KB\b/\b^KK \b\|\b^S\b Forwards \|
+ \|\bEsc I\b Text \|\bEsc <\b Left \|\b^KN\b Next \b^KP\b Prev. \|\b^P\b Up \|\uBOOKMARKS\u \|
+ \|\b^K?\b Pause \|\bEsc >\b Right \|\b^KI\b Show one / All \|\b^N\b Down \|\bEsc 0-9\b Goto \|
+ \| for prompt \|\uINSERT\u \|\uSHELL\u \|\b^B\b Left \|\bEsc Esc\b Set \|
+ \|\b^K 0-9\b Play \|\b^]\b Line \b^Q\b Ctrl \|\bF1-F4\b Term emulator \|\b^F\b Right \|\b^K-\b Auto prev\|
+ \|\b^K\\\b Repeat \|\b^@\b Space \b^\\\b Meta \|\b^K'\b In buffer \| \|\b^K=\b Auto next\|
+ \|\bEsc D\b Dump \|\bEsc Y\b Paste \|\b^KZ\b Suspend \bEsc !\b Append \| \| \|
+}
+
+{Programs
+ \|\uCOMMANDS\u \|\uCOMPILING\u \|\uQUICK\u \|
+ \|\bEsc X\b Command prompt\|\bEsc C\b Save modified compile\|\b^G\b Find word under cursor \|
+ \|\bEsc M\b Calculator \|\bEsc G\b Grep \|\b^K;\b Tags file search \|
+ \|\bshowlog\b Startup log \|\bEsc =\b To next error \|\bEsc Enter\b Complete word \|
+ \|\bupper\b Change case \|\bEsc -\b To prev. error \|\uBUFFER\u \|
+ \|\blower\b Change case \|\bEsc Space\b Jump to error \|\bEsc U\b Next \|
+ \|\bcd\b Change dir \|\uINDENT\u \|\bEsc V\b Previous \|
+ \|\bkeymap\b Change map \|\b^K,\b Less \|\bEsc X bufed\b Switch \|
+ \| \|\b^K.\b More \| \|
+}
+
+ Missing: Esc ~ not mod
+ Esc e parse errors in buffer
+ Esc ^Y yank pop
+
+{Search
+ Search sequences: \|
+ \b\\^ \\$\b matches beg./end of line \b\\.\b match any single char \|
+ \b\\< \\>\b matches beg./end of word \b\\!\b match char or expression \|
+ \b\\( \\)\b grouping \b\\|\b match left or right \|
+ \b\\[a-z]\b matches one of a set \b\\y \\Y\b short for (.*) / (!*) \|
+ \b\\{1,3}\b match 1 - 3 occurrences \b\\?\b match 0 or 1 occurrence \|
+ \b\\+\b match 1 or more occurrences \b\\*\b match 0 or more occurrences \|
+ \|
+ \b^C\b to abort \bEsc .\b to list of escape sequences \|
+}
+
+{Escape sequences
+ Escape sequences: \|
+ \b\\x{10fff}\b Unicode code point \b\\p{Ll}\b Unicode category \|
+ \b\\i\b / \b\\I\b Identifier start \b\\t\b tab \b\\e\b escape \|
+ \b\\c\b / \b\\C\b Identifier continue \b\\n\b newline \b\\r\b carriage return \|
+ \b\\d\b / \b\\D\b Digit / Not a digit \b\\b\b backspace \b\\xFF\b hex character \|
+ \b\\w\b / \b\\W\b Word / Not a word \b\\a\b alert \b\\377\b octal character \|
+ \b\\s\b / \b\\S\b Space / Not a space \b\\f\b formfeed \b\\\\\b backslash \|
+ \|
+ \|
+}
+
+{Replace
+ Replace sequences: \|
+ \b\\&\b replaced with entire match \b\\1\b - \b9\b replaced with Nth group \|
+ \b\\u \\l\b convert next to upper/lower \b\\U \\L\b case convert until \b\\E\b \|
+ \|
+ \|
+ \|
+ \|
+ \|
+ \b^C\b to abort \bEsc ,\b to list of escape sequences \|
+}
+
+{SearchOptions
+ Search options: \|
+ \br\b Replace \bk\b Restrict search to highlighted block \|
+ \bi\b Ignore case \bb\b Search backwards instead of forwards \|
+ \ba\b Search across all loaded files \|
+ \be\b Search across all files in Grep or Compile error list \|
+ \bw\b / \bn\b Allow / prevent wrap to start of file \|
+ \bx\b / \by\b Search text is standard format / JOE format regular expression \|
+ \bnnn\b Perform exactly nnn replacements \|
+ \b^C\b to abort
+}
+
+{Math
+ \uMATH COMMANDS\u \uCONSTANTS\u \|
+ \bhex oct bin\b display mode \b0xff\b hex entry \|
+ \beng dec\b engineering / normal \b0o77\b octal entry \|
+ \bins\b type result into file \b0b11\b binary entry \|
+ \beval\b evaluate block \b3e-4\b floating point entry \|
+ 2+3\b:\bins multiple commands \uVARIABLES\u \|
+ \uOPERATORS\u \bans\b Previous result \|
+ \b! ^ * / % + -\b \ba=10\b Assign a variable \|
+ \b< <= > >= == != && || ? :\b \bEsc .\b for list of functions \|
+}
+
+{Functions
+ \uFUNCTIONS\u \uCONSTANTS\u \|
+ \bsin cos tab asin acos atan\b \be pi\b \|
+ \bsinh cosh tanh asinh acosh atanh\b \|
+ \bsqrt cbrt exp ln log\b \|
+ \bint floor ceil abs\b \|
+ \berf erfc j0 j1 y0 y1\b \|
+ \bjoe(..macro..)\b - runs an editor macro \|
+ \|
+ \bEsc .\b for statistics \|
+}
+
+{Statistics
+ \uMATH COMMANDS\u \|
+ Statistics on region of numbers Linear regression on region of x y pairs \|
+ \bsum\b Sum \blr(x)\b Estimate y given x y=m*x+b \|
+ \bcnt\b Count \brlr(y)\b Estimate x given y \|
+ \bavg\b Mean \bLr rLr\b Logarithmic regression y=m*ln(x)+b \|
+ Standard deviation: \blR rlR\b Exponential regression y=e^(m*x)+b \|
+ \bdev\b all data present \bLR rLR\b Power regression y=b*x^m \|
+ \bsamp\b sample of data present Side effects: \bb\b, \bm\b: regression coef. \|
+ \br\b: correlation coef., \bcov\b: covariance \|
+}
+
+{Names
+ Hit TAB to complete names. Use up / down arrow keys to traverse history. \|
+ Special file names: \|
+ \b!\bcommand Pipe in/out of a shell command \|
+ \b>>\bfilename Append to a file \|
+ \b-\b Read/Write to/from standard I/O \|
+ filename\b,START,SIZE\b Read/Write a part of a file/device \|
+ Give START/SIZE in decimal (255), octal (0377) or hex (0xFF) \|
+ \b\\,\b Use backslash to quote special characters \|
+ \b^C\b to abort
+}
+
+{CharTable
+ \| Dec \u 0123 4567 8901 2345 0123 4567 8901 2345 \u Dec \|
+ \| 0 | \u@ABC\u \uDEFG\u \uHIJK\u \uLMNO\u \i\u@ABC\u\i \i\uDEFG\u\i \i\uHIJK\u\i \i\uLMNO\u\i | 128 \|
+ \| 16 | \uPQRS\u \uTUVW\u \uXYZ[\u \u\\]^_\u \i\uPQRS\u\i \i\uTUVW\u\i \i\uXYZ[\u\i \i\u\\]^_\u\i | 144 \|
+ \| 32 | !"# $%&' ()*+ ,-./  ¡¢£ ¤¥¦§ ¨©ª« ¬X®¯ | 160 \|
+ \| 48 | 0123 4567 89:; <=>? °±²³ ´µ¶· ¸¹º» ¼½¾¿ | 176 \|
+ \| 64 | @ABC DEFG HIJK LMNO ÀÁÂÃ ÄÅÆÇ ÈÉÊË ÌÍÎÏ | 192 \|
+ \| 80 | PQRS TUVW XYZ[ \\]^_ ÐÑÒÓ ÔÕÖ× ØÙÚÛ ÜÝÞß | 208 \|
+ \| 96 | `abc defg hijk lmno àáâã äåæç èéêë ìíîï | 224 \|
+ \| 112 | pqrs tuvw xyz{ |}~ ðñòó ôõö÷ øùúû üýþÿ | 240 \|
+}
+
+{Joe
+ Send bug reports to: http://sourceforge.net/projects/joe-editor \|
+ \|
+ default joerc file is here /etc/joe/joerc \|
+ default syntax and i18n files are here /usr/local/share/joe \|
+ additional documentation can be found here /usr/local/share/doc/joe \|
+ \|
+ \|
+ \|
+ \|
+}
+
+ FOURTH SECTION: Key bindings:
+
+ Section names you must provide:
+
+ :main For editing window
+ :prompt For prompt lines
+ :query For single-character query lines
+ :querya Singe-character query for quote
+ :querysr Search & Replace single-character query
+ :shell For shell windows
+ :vtshell For terminal emulator windows
+
+ Other sections may be given as well for organization purposes or for
+ use with the '-keymap' option.
+
+ Use:
+ :inherit name To copy the named section into the current one
+ :delete key To delete a key sequence from the current section
+
+ Keys:
+
+ Use U+12345 for specific unicode character
+ Use ^@ through ^_ and ^? for Ctrl chars
+ Use SP for space
+ Use a TO b to generate a range of characters
+ Use MDOWN, MDRAG, MUP, M2DOWN, M2DRAG, M2UP, M3DOWN, M3DRAG, M3UP for mouse
+ Use MWDOWN, MWUP for wheel mouse motion
+ Use ^# for 0x9B (for Amiga). But warning: this breaks UTF-8 keyboards.
+
+ You can also use termcap string capability names. For example:
+
+ .ku Up
+ .kd Down
+ .kl Left
+ .kr Right
+ .kh Home
+ .kH End
+ .kI Insert
+ .kD Delete
+ .kP PgUp
+ .kN PgDn
+ .k1 - .k9 F1 - F9
+ .k0 F0 or F10
+ .k; F10
+
+ Macros:
+
+ Simple macros can be made by comma seperating 2 or more command names. For
+ example:
+
+ eof,bol ^T Z Goto beginning of last line
+
+ Also quoted matter is typed in literally:
+
+ bol,">",dnarw .k1 Quote news article line
+
+ Macros may cross lines if they end with ,
+
+ Commands or named macros may be created with :def. For example, you can
+ use:
+
+ :def foo eof,bol
+
+ To define a command foo which will goto the beginning of the last line.
+
+ Recenter
+:def recenter retype,arg,"top+height/2-line",rtn,upslide
+
+:windows Bindings common to all windows
+type U+0 TO U+10FFFF
+abort ^C Abort window
+ abort ^K Q
+ abort ^K ^Q
+ abort ^K q
+querysave,query,killjoe ^K Q Query to save files, then exit
+querysave,query,killjoe ^K ^Q
+querysave,query,killjoe ^K q
+arg ^K \ Repeat next command
+explode ^K I Show all windows or show only one window
+explode ^K ^I
+explode ^K i
+help ^K H Help menu
+help ^K ^H
+help ^K h
+hnext ^[ . Next help window
+hprev ^[ , Previous help window
+math ^[ m Calculator
+math ^[ M Calculator
+ math ^[ ^M Calculator
+msg ^[ h Display a message
+msg ^[ H Display a message
+msg ^[ ^H Display a message
+nextw ^K N Goto next window
+nextw ^K ^N
+nextw ^K n
+pgdn .kN Screen down
+pgdn ^V
+pgdn ^[ [ 6 ~
+ pgdn ^# S
+pgup .kP Screen up
+pgup ^U
+pgup ^[ [ 5 ~
+ pgup ^# T
+play ^K 0 TO 9 Execute macro
+prevw ^K P Goto previous window
+prevw ^K ^P
+prevw ^K p
+query ^K ? Macro query insert
+record ^K [ Record a macro
+ retype ^R Refresh screen
+ recenter ^R Recenter and refresh screen
+rtn ^M Return
+shell ^K Z Shell escape
+shell ^K ^Z
+shell ^K z
+stop ^K ] Stop recording
+ Mouse handling
+defmdown MDOWN Move the cursor to the mouse location
+defmup MUP
+defmdrag MDRAG Select a region of characters
+defm2down M2DOWN Select the word at the mouse location
+defm2up M2UP
+defm2drag M2DRAG Select a region of words
+defm3down M3DOWN Select the line at the mouse location
+defm3up M3UP
+defm3drag M3DRAG Select a region of lines
+defmiddleup MIDDLEUP
+defmiddledown MIDDLEDOWN Insert text
+
+xtmouse ^[ [ M Introduces an xterm mouse event
+extmouse ^[ [ < Introduces an extended xterm mouse event
+
+ Sample if/then/else macro
+ if,"char==65",then,"it's an A",else,"it's not an a",endif ^[ q
+
+:main Text editing window
+:inherit windows
+
+ Spell-check macros
+
+ Ispell
+:def ispellfile filt,"cat >ispell.tmp;ispell ispell.tmp </dev/tty >/dev/tty;cat ispell.tmp;/bin/rm ispell.tmp",rtn,retype
+:def ispellword psh,nextword,markk,prevword,markb,filt,"cat >ispell.tmp;ispell ispell.tmp </dev/tty >/dev/tty;tr -d <ispell.tmp '\\012';/bin/rm ispell.tmp",rtn,retype,nextword
+
+ Aspell
+:def aspellfile filt,"SPLTMP=ispell.tmp;cat >$SPLTMP;aspell --lang=",language,".",charset," -x -c $SPLTMP </dev/tty >/dev/tty;cat $SPLTMP;/bin/rm $SPLTMP",rtn,retype
+:def aspellword psh,nextword,markk,prevword,markb,filt,"SPLTMP=ispell.tmp;cat >$SPLTMP;aspell --lang=",language,".",charset," -x -c $SPLTMP </dev/tty >/dev/tty;tr -d <$SPLTMP '\\012';/bin/rm $SPLTMP",rtn,retype,nextword
+
+
+aspellfile ^[ l
+aspellword ^[ n
+
+ Compile
+
+:def compile mwind!,mfit!,querysave,query,scratch,"* Build Log *",rtn,bof,markb,eof," ",markk,blkdel,build
+
+ Grep
+
+:def grep_find mwind!,mfit!,scratch,"* Grep Log *",rtn,bof,markb,eof," ",markk,blkdel,grep
+
+ Man page
+
+:def man scratch,"* Man Page *",rtn,bof,markb,eof," ",markk,blkdel," ",ltarw,run,"man -P cat -S 2:3 "
+
+ Shell windows
+ We load the already existing Startup Log first so that Shell does not inherit the current directory.
+
+:def shell1 scratch_push,"* Startup Log *",rtn,scratch_push,"* Shell 1 *",rtn,vtbknd!,eof
+:def shell2 scratch_push,"* Startup Log *",rtn,scratch_push,"* Shell 2 *",rtn,vtbknd!,eof
+:def shell3 scratch_push,"* Startup Log *",rtn,scratch_push,"* Shell 3 *",rtn,vtbknd!,eof
+:def shell4 scratch_push,"* Startup Log *",rtn,scratch_push,"* Shell 4 *",rtn,vtbknd!,eof
+
+ Macros allowed in shell window commands
+:def shell_clear psh,bof,markb,eof,markk,blkdel
+:def shell_parse parserr
+:def shell_gparse gparse
+:def shell_release release
+:def shell_math maths
+:def shell_abort abort
+:def shell_typemath txt,maths,"ins",rtn,rtn,txt," ",rtn,txt,quote,"d",rtn
+:def shell_rtn rtn
+:def shell_edit edit
+:def shell_dellin dellin
+:def shell_cd cd
+:def shell_pop popabort
+:def shell_markb markb
+:def shell_markk markk
+
+ Split window version
+ :def shell1 if,"is_shell==0",then,tw1,mfit,endif,scratch,"* Shell 1 *",rtn,vtbknd!,eof
+ :def shell2 if,"is_shell==0",then,tw1,mfit,endif,scratch,"* Shell 2 *",rtn,vtbknd!,eof
+ :def shell3 if,"is_shell==0",then,tw1,mfit,endif,scratch,"* Shell 3 *",rtn,vtbknd!,eof
+ :def shell4 if,"is_shell==0",then,tw1,mfit,endif,scratch,"* Shell 4 *",rtn,vtbknd!,eof
+
+
+ Here we guess some common key sequences which either do not have termcap
+ sequences or which are frequently wrong. Note that if the termcap entry is
+ correct, it will override these later on.
+
+paste ^[ ] 5 2 ; Base64 paste (obsolete)
+brpaste ^[ [ 2 0 0 ~ Bracketed paste
+brpaste_done ^[ [ 2 0 1 ~ Bracketed paste done
+
+insc ^[ [ 2 ~
+insc ^[ [ L SCO
+
+delch ^[ [ 3 ~
+
+pgup ^[ [ I SCO
+
+pgdn ^[ [ G SCO
+
+home ^[ [ 1 ~ Putty, Linux, Cygwin
+home ^[ [ H Xterm, Konsole, SCO
+home ^[ O H gnome-terminal
+home ^[ [ 7 ~ RxVT
+ home ^# SP A Amiga
+
+eol ^[ [ 4 ~ Putty, Linux, Cygwin, ssh
+eol ^[ [ F Xterm, Konsole, SCO
+eol ^[ O F gnome-terminal
+eol ^[ [ 8 ~ RxVT
+ eol ^# SP @ Amiga
+
+rtarw,ltarw,begin_marking,rtarw,toggle_marking ^[ [ 1 ; 5 C Mark right Xterm
+rtarw,ltarw,begin_marking,rtarw,toggle_marking ^[ [ 5 C Mark right Gnome-terminal
+ (Almost all termcap entries have ^[ O C as an arrow key).
+ rtarw,ltarw,begin_marking,rtarw,toggle_marking ^[ O C Mark right Putty Ctrl-rtarw
+rtarw,ltarw,begin_marking,rtarw,toggle_marking ^[ O c Mark right RxVT Ctrl-rtarw
+
+ltarw,rtarw,begin_marking,ltarw,toggle_marking ^[ [ 1 ; 5 D Mark left
+ltarw,rtarw,begin_marking,ltarw,toggle_marking ^[ [ 5 D Mark left
+ ltarw,rtarw,begin_marking,ltarw,toggle_marking ^[ O D Mark left Putty Ctrl-ltarw
+ltarw,rtarw,begin_marking,ltarw,toggle_marking ^[ O d Mark left RxVT Ctrl-ltarw
+
+uparw,dnarw,begin_marking,uparw,toggle_marking ^[ [ 1 ; 5 A Mark up
+uparw,dnarw,begin_marking,uparw,toggle_marking ^[ [ 5 A Mark up
+ uparw,dnarw,begin_marking,uparw,toggle_marking ^[ O A Mark up Putty Ctrl-uparw
+uparw,dnarw,begin_marking,uparw,toggle_marking ^[ O a Mark up RxVT Ctrl-uparw
+
+dnarw,uparw,begin_marking,dnarw,toggle_marking ^[ [ 1 ; 5 B Mark down
+dnarw,uparw,begin_marking,dnarw,toggle_marking ^[ [ 5 B Mark down
+ dnarw,uparw,begin_marking,dnarw,toggle_marking ^[ O B Mark down Putty Ctrl-dnarw
+dnarw,uparw,begin_marking,dnarw,toggle_marking ^[ O b Mark down RxVT Ctrl-dnarw
+
+blkdel,nmark ^[ [ 3 ; 5 - Gnome-terminal Ctrl-Del
+blkdel,nmark ^[ [ 3 ; 5 ~ Xterm Ctrl-Del
+
+yank ^[ [ 2 ; 5 - Gnome-terminal Ctrl-Ins
+yank ^[ [ 2 ; 5 ~ Xterm Ctrl-Ins
+
+ Extra functions not really part of JOE user interface:
+
+delbol ^[ o Delete to beginning of line
+delbol ^[ ^O Delete to beginning of line
+dnslide ^[ z Scroll down one line
+dnslide ^[ Z Scroll down one line
+dnslide ^[ ^Z Scroll down one line
+dnslide,dnslide,dnslide,dnslide MWDOWN
+compile ^[ c Compile
+compile ^[ C
+compile ^[ ^C Compile
+grep_find ^[ g Grep
+grep_find ^[ G Grep
+grep_find ^[ ^G Grep
+execmd ^[ x Prompt for command to execute
+execmd ^[ X Prompt for command to execute
+execmd ^[ ^X Prompt for command to execute
+finish ^[ ^I Complete word in document
+finish ^[ ^M Complete word: used to be math
+mwind!,mfit,jump,bol ^[ SP
+isrch ^[ s Forward incremental search
+isrch ^[ S Forward incremental search
+isrch ^[ ^S Forward incremental search
+isrch ^S
+notmod ^[ ~ Not modified
+mwind,mfit,prevw,nxterr ^[ = To next error
+parserr ^[ e Parse errors in current buffer
+parserr ^[ E Parse errors in current buffer
+parserr ^[ ^E Parse errors in current buffer
+mwind,mfit,prevw,prverr ^[ - To previous error
+rsrch ^[ r Backward incremental search
+rsrch ^[ R Backward incremental search
+rsrch ^[ ^R Backward incremental search
+retype,rsrch ^R
+run ^[ ! Run a program in a window
+tomarkb ^[ b Go to beginning of marked block
+tomarkb ^[ ^B Go to beginning of marked block
+tomarkk ^[ k Go to end of marked block
+tomarkk ^[ ^K Go to end of marked block
+tomarkk ^[ K Go to end of marked block
+txt ^[ i Prompt for text and insert it
+txt ^[ I Prompt for text and insert it
+upslide ^[ w Scroll up one line
+upslide ^[ ^W Scroll up one line
+upslide ^[ W Scroll up one line
+upslide,upslide,upslide,upslide MWUP
+yank ^[ y Undelete text
+yankpop ^[ ^Y Undelete text
+yank ^[ Y Undelete text
+
+ toggle_marking ^@ Ctrl-space block selection method
+insc ^@ Ctrl-space used to insert a space
+
+ bufed ^[ d Menu of buffers
+nbuf ^[ v Next buffer
+nbuf ^[ V Next buffer
+nbuf ^[ ^V Next buffer
+pbuf ^[ u Prev buffer
+pbuf ^[ U Prev buffer
+pbuf ^[ ^U Prev buffer
+ query ^[ q Quoted insert
+ byte ^[ n Goto byte
+ col ^[ c Goto column
+ abortbuf ^[ k Kill current buffer- don't mess with windows
+ ask ^[ a Ask to save current buffer
+ bop ^[ p Backwards paragraph
+ bos ^[ x Bottom of screen
+ copy ^[ ^W Copy block into yank
+ dupw ^[ \ Split window
+ eop ^[ n Forwards paragraph
+ format ^[ j Format paragraph ignore block
+ markl ^[ l Mark line
+ nmark ^[ @ Turn off ^KB ^KK
+ pop ^[ > Pop ^KB ^KK
+ psh ^[ < Push ^KB ^KK
+ swap ^[ x Swap ^KB and cursor
+ tomarkbk ^[ g Switch between beginning and end of marked
+ tos ^[ e Top of screen
+ tw0 ^[ 0 Kill current window (orphans buffer)
+ tw1 ^[ 1 Kill all other windows (orphans buffers)
+ uarg ^[ u Universal argument
+ yank ^[ ^Y Undelete previous text
+ yapp ^[ w Append next delete to previous yank
+
+ Standard JOE user interface
+
+quote8 ^\ Enter Meta chars
+ quote ` Enter Ctrl chars
+quote ^[ ' Enter Ctrl chars
+quote ^Q
+
+backs ^? Backspace
+backs ^H
+backw ^O Backspace word
+bknd ^K ' Shell window
+blkcpy ^K C Copy marked block
+blkcpy ^K ^C
+blkcpy ^K c
+blkdel ^K Y Delete marked block
+blkdel ^K ^Y
+blkdel ^K y
+blkmove ^K M Move marked block
+blkmove ^K ^M
+blkmove ^K m
+blksave ^K W Save marked block
+blksave ^K ^W
+blksave ^K w
+bof ^K U Goto beginning of file
+bof ^K ^U
+bof ^K u
+ bol .kh Goto beginning of line
+ bol ^A
+ bol ^# SP A
+home .kh
+home ^A
+center ^K A Center line
+center ^K ^A
+center ^K a
+crawll ^K < Pan left
+crawll ^[ < Pan left
+crawlr ^K > Pan right
+crawlr ^[ > Pan right
+delch .kD Delete character
+delch ^D
+deleol ^J Delete to end of line
+dellin ^Y Delete entire line
+delw ^W Delete word to right
+dnarw .kd Go down
+dnarw ^N
+dnarw ^[ O B
+dnarw ^[ [ B
+ dnarw ^# B
+edit ^K E Edit a file
+edit ^K ^E
+edit ^K e
+eof ^K V Go to end of file
+eof ^K ^V
+eof ^K v
+eol .kH Go to end of line
+eol .@7
+eol ^E
+exsave ^K X Save and exit
+exsave ^K ^X
+exsave ^K x
+ffirst ^K F Find first
+ffirst ^K ^F
+ffirst ^K f
+filt ^K / Filter block
+ finish ^K ^M Complete text under cursor
+fnext ^L Find next
+fmtblk ^K J Format paragraphs in block
+fmtblk ^K ^J
+fmtblk ^K j
+gomark ^[ 0 TO 9 Goto bookmark
+groww ^K G Grow window
+groww ^K ^G
+groww ^K g
+insc .kI Insert a space
+ insc ^@
+insf ^K R Insert a file
+insf ^K ^R
+insf ^K r
+lindent ^K , Indent to left
+line ^K L Goto line no.
+line ^K ^L
+line ^K l
+ltarw .kl Go left
+ltarw ^B
+ltarw ^[ O D
+ltarw ^[ [ D
+ ltarw ^# D
+macros ^[ d Dump keyboard macros
+macros ^[ ^D
+markb ^K B Set beginning of marked block
+markb ^K ^B
+markb ^K b
+markk ^K K Set end of marked block
+markk ^K ^K
+markk ^K k
+ mode ^T Options menu
+menu,"root",rtn ^T
+nextpos ^K = Goto next position in position history
+nextword ^X Goto next word
+open ^] Split line
+prevpos ^K - Previous position in history
+prevword ^Z Previous word
+reload ^K ` Revert file
+redo ^^ Redo changes
+rindent ^K . Indent to right
+rtarw .kr Go right
+rtarw ^F
+rtarw ^[ O C
+rtarw ^[ [ C
+ rtarw ^# C
+run ^K ! Run a shell command
+save ^K D Save file
+save ^K S
+save ^K ^D
+save ^K ^S
+save ^K d
+save ^K s
+setmark ^[ ^[ Set bookmark
+shrinkw ^K T Shrink window
+shrinkw ^K ^T
+shrinkw ^K t
+splitw ^K O Split window
+splitw ^K ^O
+splitw ^K o
+stat ^K SP Show status
+stat ^K ^@ Show status
+tag ^K ; Tags file search
+tomatch ^G Goto matching parenthasis
+undo ^_ Undo changes
+uparw .ku Go up
+ uparw ^# A
+uparw ^P
+uparw ^[ O A
+uparw ^[ [ A
+shell1 ^[ [ 1 1 ~
+shell1 ^[ O P
+shell1 ^[ [ [ A
+shell1 .k1
+shell2 ^[ [ 1 2 ~
+shell2 ^[ O Q
+shell2 ^[ [ [ B
+shell2 .k2
+shell3 ^[ [ 1 3 ~
+shell3 ^[ O R
+shell3 ^[ [ [ C
+shell3 .k3
+shell4 ^[ [ 1 4 ~
+shell4 ^[ O S
+shell4 ^[ [ [ D
+shell4 .k4
+
+:prompt Prompt windows
+:inherit main
+if,"byte>size",then,complete,complete,else,delch,endif ^D
+complete ^I
+dnarw,eol .kd Go down
+dnarw,eol ^N
+dnarw,eol ^[ O B
+dnarw,eol ^[ [ B
+ dnarw,eol ^# B
+uparw,eol .ku Go up
+ uparw,eol ^# A
+uparw,eol ^P
+uparw,eol ^[ O A
+uparw,eol ^[ [ A
+
+:menu Selection menus
+:inherit windows
+
+pgupmenu ^[ [ I
+
+pgdnmenu ^[ [ G
+
+bolmenu ^[ [ 1 ~ Putty, Linux, Cygwin
+bolmenu ^[ [ H Xterm, Konsole
+bolmenu ^[ O H gnome-terminal
+bolmenu ^[ [ 7 ~ RxVT
+ bolmenu ^# SP A Amiga
+
+eolmenu ^[ [ 4 ~ Putty, Linux, Cygwin, ssh
+eolmenu ^[ [ F Xterm, Konsole
+eolmenu ^[ O F gnome-terminal
+eolmenu ^[ [ 8 ~ RxVT
+ eolmenu ^# SP @ Amiga
+
+abort ^[ ^[ Why?
+backsmenu ^?
+backsmenu ^H
+bofmenu ^K U
+bofmenu ^K ^U
+bofmenu ^K u
+bolmenu .kh
+bolmenu ^A
+dnarwmenu .kd
+dnarwmenu ^N
+dnarwmenu ^[ [ B
+dnarwmenu ^[ O B
+ dnarwmenu ^# B
+dnarwmenu MWDOWN
+eofmenu ^K V
+eofmenu ^K ^V
+eofmenu ^K v
+eolmenu .kH
+eolmenu ^E
+ltarwmenu .kl
+ltarwmenu ^B
+ltarwmenu ^[ [ D
+ltarwmenu ^[ O D
+ ltarwmenu ^# D
+pgdnmenu .kN Screen down
+pgdnmenu ^V
+pgdnmenu ^[ [ 6 ~
+ pgdnmenu ^# S
+pgupmenu .kP Screen up
+pgupmenu ^U
+pgupmenu ^[ [ 5 ~
+ pgupmenu ^# T
+rtarwmenu .kr
+rtarwmenu ^F
+rtarwmenu ^[ [ C
+ rtarwmenu ^# C
+rtarwmenu ^[ O C
+rtn SP
+rtn ^I
+rtn ^K H
+rtn ^K h
+rtn ^K ^H
+tabmenu ^I
+uparwmenu .ku
+uparwmenu ^P
+uparwmenu ^[ [ A
+uparwmenu ^[ O A
+ uparwmenu ^# A
+uparwmenu MWUP
+defm2down M2DOWN Hits return key
+
+:query Single-key query window
+:inherit windows
+
+:querya Single-key query window for quoting
+type U+0 TO U+10FFFF
+
+:querysr Search & replace query window
+type U+0 TO U+10FFFF
+
+:shell Input to shell windows
+:inherit main
+"" ^C Abort
+"" ^D Eof
+" " ^I Tab
+"" ^H Backspace
+" " ^M Return
+"" ^? Backspace
+
+:vtshell Input to ANSI shell windows
+:inherit main
+""  [ A
+"" .ku
+""  [ B
+"" .kd
+""  [ C
+"" .kr
+""  [ D
+"" .kl
+"" ^A BOL for bash
+"" ^C Abort
+"" ^D Eof
+"" ^E EOL for bash
+" " ^I Tab
+"" ^H Backspace
+" " ^M Return
+"" ^? Backspace
diff --git a/config/obr/joe/jstarrc b/config/obr/joe/jstarrc
index c941e82..63c43b3 100644
--- a/config/obr/joe/jstarrc
+++ b/config/obr/joe/jstarrc
@@ -53,6 +53,8 @@
-help_is_utf8 Set if help text is in UTF-8 format. Leave clear if it's a raw 8-bit format.
-mid Cursor is recentered when scrolling is necessary
+ -left nn Amount to jump left when scrolling is necessary (-1 for 1/4 width)
+ -right nn Amount to jump right when scrolling is necessary (-1 for 1/4 width)
-marking Text between ^KB and cursor is highlighted (use with -lightoff)
-asis Characters 128 - 255 shown as-is
-force Force final newline when files are saved
@@ -96,7 +98,7 @@
-lines nnn Set no. screen lines
-baud nnn Set baud rate for terminal optimizations
-columns nnn Set no. screen columns
- -help Start with help on
+ -helpon Start with help on
-skiptop nnn Don't use top nnn lines of the screen
-notite Don't send terminal initialization and termination strings: prevents
@@ -235,6 +237,11 @@
-rmsg %S Row %4r Col %3c %t Ctrl-J for help
-smsg ** Line %r Col %c Offset %o(0x%O) %e %a(0x%A) Width %w **
-zmsg ** Line %r Col %c Offset %o(0x%O) **
+-xmsg \i Joe's Own Editor %v (%b) ** Type \bCtrl-K Q\b to exit or \bCtrl-J\b for help **\i
+
+ Key sequence hints which are displayed in various prompts.
+-aborthint ^C
+-helphint ^J
SECOND SECTION: File name dependant local option settings:
@@ -409,6 +416,7 @@ mode,"asis",rtn % % Meta chars as-is
mode,"language",rtn V Language
mode,"picture",rtn P picture %Zpicture%
mode,"type",rtn F File type [%Ztype%]
+mode,"title",rtn C Context %Ztitle%
menu,"more-options",rtn % % More options...
:defmenu more-options menu,"root",rtn
@@ -490,6 +498,8 @@ mode,"backpath",rtn % % Path to backup files %Zbackpath%
:defmenu cursor menu,"more-options",rtn
mode,"pg",rtn % % No. PgUp/PgDn lines %Zpg%
mode,"mid",rtn C Center on scroll %Zmid%
+mode,"left",rtn L Columns to scroll left %Zleft%
+mode,"right",rtn R Columns to scroll right %Zright%
mode,"floatmouse",rtn % % Click past end %Zfloatmouse%
mode,"rtbutton",rtn % % Right button %Zrtbutton%
@@ -750,6 +760,8 @@ defm2drag M2DRAG Select a region of words
defm3down M3DOWN Select the line at the mouse location
defm3up M3UP
defm3drag M3DRAG Select a region of lines
+defmiddleup MIDDLEUP
+defmiddledown MIDDLEDOWN Insert text
xtmouse ^[ [ M Introduces an xterm mouse event
extmouse ^[ [ < Introduces an extended xterm mouse event
@@ -766,12 +778,12 @@ extmouse ^[ [ < Introduces an extended xterm mouse event
:def aspellword psh,nextword,markk,prevword,markb,filt,"SPLTMP=ispell.tmp;cat >$SPLTMP;aspell --lang=",language,".",charset," -x -c $SPLTMP </dev/tty >/dev/tty;tr -d <$SPLTMP '\\012';/bin/rm $SPLTMP",rtn,retype,nextword
-aspellfile ^Q l
-aspellfile ^Q L
-aspellfile ^Q ^L
-aspellword ^Q n
-aspellword ^Q N
-aspellword ^Q ^N
+ispellfile ^Q l
+ispellfile ^Q L
+ispellfile ^Q ^L
+ispellword ^Q n
+ispellword ^Q N
+ispellword ^Q ^N
Compile macro
diff --git a/config/obr/nsd-external/zones/maschezuoz.ch b/config/obr/nsd-external/zones/maschezuoz.ch
index e9d62cf..169ca52 100644
--- a/config/obr/nsd-external/zones/maschezuoz.ch
+++ b/config/obr/nsd-external/zones/maschezuoz.ch
@@ -3,7 +3,7 @@
$TTL 60
@ IN SOA ns.maschezuoz.ch. admin.maschezuoz.ch. (
- 2016090301 ; serial
+ 2017050500 ; serial
3h ; refresh
15m ; retry
2w ; expire
@@ -24,6 +24,7 @@ $ORIGIN maschezuoz.ch.
ns IN A 83.150.2.48
www IN A 83.150.2.48
+www-joomla IN A 83.150.2.48
imap IN A 83.150.2.48
smtp IN A 83.150.2.48
webmail IN A 83.150.2.48
diff --git a/config/obr/nsd-internal/zones/1.168.192.in-addr b/config/obr/nsd-internal/zones/1.168.192.in-addr
index 308c459..da3cf1d 100644
--- a/config/obr/nsd-internal/zones/1.168.192.in-addr
+++ b/config/obr/nsd-internal/zones/1.168.192.in-addr
@@ -5,7 +5,7 @@ $ORIGIN .
$TTL 60
1.168.192.in-addr.arpa IN SOA obr.lan. root.obr.lan. (
- 2017031000 ; serial
+ 2017080800 ; serial
3h ; refresh
15m ; retry
2w ; expire
@@ -33,6 +33,9 @@ $ORIGIN 1.168.192.in-addr.arpa.
18 IN PTR eurobuild4.lan.
19 IN PTR phone.lan.
20 IN PTR euromac.lan.
-21 IN PTR eurobuild5.lan
+21 IN PTR eurobuild5.lan.
+22 IN PTR eurobuild6.lan.
+23 IN PTR eurobuild7.lan.
+24 IN PTR eurotv.lan.
253 IN PTR wrt2.lan.
254 IN PTR wrt1.lan.
diff --git a/config/obr/nsd-internal/zones/lan b/config/obr/nsd-internal/zones/lan
index 8c867e3..820d4c2 100644
--- a/config/obr/nsd-internal/zones/lan
+++ b/config/obr/nsd-internal/zones/lan
@@ -5,7 +5,7 @@ $ORIGIN .
$TTL 60
lan IN SOA obr.lan. root.obr.lan. (
- 2017031000 ; serial
+ 2017080800 ; serial
3h ; refresh
15m ; retry
2w ; expire
@@ -34,6 +34,9 @@ eurobuild4 A 192.168.1.18
phone A 192.168.1.19
euromac A 192.168.1.20
eurobuild5 A 192.168.1.21
+eurobuild6 A 192.168.1.22
+eurobuild7 A 192.168.1.23
+eurotv A 192.168.1.24
wrt2 A 192.168.1.253
wrt1 A 192.168.1.254
iway-gateway A 83.150.2.1
diff --git a/config/obr/nsd-internal/zones/maschezuoz.ch b/config/obr/nsd-internal/zones/maschezuoz.ch
index 5772068..6cf384a 100644
--- a/config/obr/nsd-internal/zones/maschezuoz.ch
+++ b/config/obr/nsd-internal/zones/maschezuoz.ch
@@ -3,7 +3,7 @@
$TTL 60
@ IN SOA ns.maschezuoz.ch. admin.maschezuoz.ch. (
- 2016090500 ; serial
+ 2017050502 ; serial
3h ; refresh
15m ; retry
2w ; expire
@@ -21,6 +21,7 @@ $ORIGIN maschezuoz.ch.
ns A 192.168.1.1
www A 192.168.1.15
+www-joomla A 192.168.1.15
smtp A 192.168.1.15
imap A 192.168.1.15
webmail A 192.168.1.15
diff --git a/config/obr/ntpd.conf b/config/obr/ntpd.conf
index f006321..77dba6a 100644
--- a/config/obr/ntpd.conf
+++ b/config/obr/ntpd.conf
@@ -1,3 +1,7 @@
+# $OpenBSD: ntpd.conf,v 1.14 2015/07/15 20:28:37 ajacoutot Exp $
+#
+# See ntpd.conf(5) and /etc/examples/ntpd.conf
+
servers pool.ntp.org
listen on 127.0.0.1
listen on 192.168.1.1
diff --git a/config/obr/pf.conf b/config/obr/pf.conf
index d29aa8a..f60828c 100644
--- a/config/obr/pf.conf
+++ b/config/obr/pf.conf
@@ -85,10 +85,10 @@ pass on $WLAN_if all
# relayd and bruteforce attack scrubbing
pass in on $ext_if proto tcp from any to port 80
-pass in on $ext_if proto tcp from any to port 443
# reroute public services to their machines in the LAN
pass in on $ext_if proto tcp from any to port 25 rdr-to $euroweb
+pass in on $ext_if proto tcp from any to port 443 rdr-to $euroweb
pass in on $ext_if proto tcp from any to port 587 rdr-to $euroweb
pass in on $ext_if proto tcp from any to port 110 rdr-to $euroweb
pass in on $ext_if proto tcp from any to port 143 rdr-to $euroweb
@@ -97,14 +97,16 @@ pass in on $ext_if proto tcp from any to port 995 rdr-to $euroweb
pass in on $ext_if proto tcp from any to port 9418 rdr-to $euroweb
anchor "ftp-proxy/*"
pass in on $ext_if inet proto tcp to port 21 divert-to 127.0.0.1 port 8021
-pass out on $int_if inet proto tcp to $eurodata port 21 user proxy
+pass out on $int_if inet proto tcp to $eurodata port 21 user _ftp_proxy
pass in on $ext_if inet proto tcp to port 2121 divert-to 127.0.0.1 port 8022
-pass out on $int_if inet proto tcp to $eurobuild3 port 2121 user proxy
+pass out on $int_if inet proto tcp to $eurobuild3 port 2121 user _ftp_proxy
pass in on $ext_if proto tcp from any to port 2221 rdr-to $euroweb port 22
+pass in on $ext_if proto tcp from any to port 2222 rdr-to $eurodata port 22
pass in on $ext_if proto tcp from any to port 2223 rdr-to $eurobuild3 port 22
pass in on $ext_if proto tcp from any to port 2224 rdr-to $eurobuild4 port 22
pass in on $ext_if proto tcp from any to port 2225 rdr-to $eurobuild5 port 22
pass in on $ext_if proto tcp from any to port 5900:5999 rdr-to $eurobuild3
pass in on $ext_if proto tcp from any to port 6881:6889 rdr-to $eurobuild3
+pass in on $ext_if proto tcp from any to port 9981:9982 rdr-to $eurobuild3
pass in on $ext_if proto tcp from any to port 6001 rdr-to $europa1 port 6000
pass in on $ext_if proto tcp from any to port 9372 rdr-to $eeepc port 9372
diff --git a/config/obr/relayd.conf b/config/obr/relayd.conf
index 3036e5f..6be42f6 100644
--- a/config/obr/relayd.conf
+++ b/config/obr/relayd.conf
@@ -20,17 +20,19 @@ http protocol "http_protocol" {
match request header set "Connection" value "close"
match request header set "Keep-Alive" value "$TIMEOUT"
- match response header set "Server" value "Non of your business"
+ match response header set "Server" value "None of your business"
tcp { nodelay, sack, socket buffer 65536, backlog 128 }
match request tag disallowed_host
match request quick header "Host" value "www.maschezuoz.ch" \
forward to <euroweb> no tag
- match request quick header "Host" value "www.andreasbaumann.cc" \
+ match request quick header "Host" value "www-joomla.maschezuoz.ch" \
forward to <euroweb> no tag
match request quick header "Host" value "maschezuoz.ch" \
forward to <euroweb> no tag
+ match request quick header "Host" value "www.andreasbaumann.cc" \
+ forward to <euroweb> no tag
match request quick header "Host" value "andreasbaumann.cc" \
forward to <euroweb> no tag
match request quick header "Host" value "git.andreasbaumann.cc" \
@@ -43,26 +45,10 @@ http protocol "http_protocol" {
forward to <euroweb> no tag
match request quick header "Host" value "mon.andreasbaumann.cc" \
forward to <euroserver> no tag
- match request quick header "Host" value "www.maschezuoz.ch" \
- forward to <euroweb> no tag
block request tagged disallowed_host label "BAD host"
}
-http protocol "https_protocol" {
-
- return error
-
- match request header append "X-Forwarded-For" value "$REMOTE_ADDR"
- match request header append "X-Forwarded-By" value "$SERVER_ADDR:$SERVER_PORT"
- match request header set "Connection" value "close"
- match request header set "Keep-Alive" value "$TIMEOUT"
-
- match response header set "Server" value "Non of your business"
-
- tcp { nodelay, sack, socket buffer 65536, backlog 128 }
-}
-
relay http_relay {
listen on $EXT_IF port 80
protocol http_protocol
@@ -70,11 +56,4 @@ relay http_relay {
forward to <euroweb> port 80
forward to <euroserver> port 80
}
-
-relay https_relay {
- listen on $EXT_IF port 443 tls
- protocol https_protocol
-
- forward with tls to <euroweb> port 443
-}
diff --git a/config/obr/unbound/etc/root.hints b/config/obr/unbound/etc/root.hints
index 7408cc6..198d1b3 100644
--- a/config/obr/unbound/etc/root.hints
+++ b/config/obr/unbound/etc/root.hints
@@ -1,92 +1,92 @@
-; This file holds the information on root name servers needed to
+; This file holds the information on root name servers needed to
; initialize cache of Internet domain name servers
; (e.g. reference this file in the "cache . <file>"
-; configuration file of BIND domain name servers).
-;
+; configuration file of BIND domain name servers).
+;
; This file is made available by InterNIC
; under anonymous FTP as
-; file /domain/named.cache
+; file /domain/named.cache
; on server FTP.INTERNIC.NET
; -OR- RS.INTERNIC.NET
-;
-; last update: April 11, 2017
-; related version of root zone: 2017041101
-;
-; formerly NS.INTERNIC.NET
+;
+; last update: August 29, 2017
+; related version of root zone: 2017082901
+;
+; FORMERLY NS.INTERNIC.NET
;
. 3600000 NS A.ROOT-SERVERS.NET.
A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4
A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30
-;
-; FORMERLY NS1.ISI.EDU
+;
+; FORMERLY NS1.ISI.EDU
;
. 3600000 NS B.ROOT-SERVERS.NET.
B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201
-B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b
-;
-; FORMERLY C.PSI.NET
+B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b
+;
+; FORMERLY C.PSI.NET
;
. 3600000 NS C.ROOT-SERVERS.NET.
C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12
C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c
-;
-; FORMERLY TERP.UMD.EDU
+;
+; FORMERLY TERP.UMD.EDU
;
. 3600000 NS D.ROOT-SERVERS.NET.
D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13
D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d
-;
+;
; FORMERLY NS.NASA.GOV
;
. 3600000 NS E.ROOT-SERVERS.NET.
E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10
E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e
-;
+;
; FORMERLY NS.ISC.ORG
;
. 3600000 NS F.ROOT-SERVERS.NET.
F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241
F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f
-;
+;
; FORMERLY NS.NIC.DDN.MIL
;
. 3600000 NS G.ROOT-SERVERS.NET.
G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4
G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d
-;
+;
; FORMERLY AOS.ARL.ARMY.MIL
;
. 3600000 NS H.ROOT-SERVERS.NET.
H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53
H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53
-;
+;
; FORMERLY NIC.NORDU.NET
;
. 3600000 NS I.ROOT-SERVERS.NET.
I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17
I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53
-;
+;
; OPERATED BY VERISIGN, INC.
;
. 3600000 NS J.ROOT-SERVERS.NET.
J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30
J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30
-;
+;
; OPERATED BY RIPE NCC
;
. 3600000 NS K.ROOT-SERVERS.NET.
K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129
K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1
-;
+;
; OPERATED BY ICANN
;
. 3600000 NS L.ROOT-SERVERS.NET.
L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42
L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42
-;
+;
; OPERATED BY WIDE
;
. 3600000 NS M.ROOT-SERVERS.NET.
M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33
M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35
-; End of file
+; End of file \ No newline at end of file
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-05-13 22:34:56 +0000