mirror of
https://git.openwrt.org/feed/packages.git
synced 2024-06-18 13:23:57 +02:00
f62599d27e
**tl;dr:** The functions `{add,del}_ssl` modify a server
section of the UCI config if there is no `.conf` file with
the same name in `/etc/nginx/conf.d/`.
Then `init_lan` creates `/var/lib/nginx/uci.conf` files by
copying the `/etc/nginx/uci.conf.template` and standard
options from the UCI config; additionally the special path
`logd` can be used in `{access,error}_log`.
The init does not change the configuration beside
re-creating self-signed certificates when needed. This is
also the only purpose of the new `check_ssl`, which is
installed as yearly cron job.
**Initialization:**
Invoking `nginx-util init_lan` parses the UCI configuration
for package `nginx`. It creates a server part in
`/var/lib/nginx/uci.conf` for each `section server '$name'`
by copying all UCI options but the following:
* `option uci_manage_ssl` is skipped. It is set to
'self-signed' by `nginx-util add_ssl $name`, removed by
`nginx-util del_ssl $name` and used by
`nginx-util check_ssl` (see below).
* `logd` as path in `error_log` or `access_log` writes them
to STDERR respective STDOUT, which are fowarded by Nginx's
init to the log daemon. Specifically:
`option error_log 'logd'` becomes `error_log stderr;` and
`option access_log 'logd openwrt'` becomes
`access_log /proc/self/fd/1 openwrt;`
Other `[option|list] key 'value'` entries just become
`key value;` directives.
The init.d calls internally also `check_ssl` for rebuilding
self-signed SSL certificates if needed (see below). And it
still sets up `/var/lib/nginx/lan{,_ssl}.listen` files as
it is doing in the current version (so they stay available).
**Defaults:**
The package installs the file `/etc/nginx/restrict_locally`
containing allow/deny directives for restricting the access
to LAN addresses by including it into a server part. The
default server '_lan' includes this file and listens on all
IPs (instead of only the local IPs as it did before; other
servers do not need to listen explicitly on the local IPs
anymore). The default server is contained together with a
server that redirects HTTP requests for inexistent URLs to
HTTPS in the UCI configuration file `/etc/config/nginx`.
Furthermore, the packages installs a
`/etc/nginx/uci.conf.template` containing the current setup
and a marker, which will be replaced by the created UCI
servers when calling `init_lan`.
**Other:**
If there is a file named `/etc/nginx/conf.d/$name.conf` the
functions `init_lan`, `add_ssl $name` and `del_ssl $name`
will use that file instead of a UCI server section (this is
similar to the current version).
Else it selects the UCI `section server $name`, or, when
there is no such section, it searches for the first one
having `option server_name '… $name …'`. For this section:
* `nginx-util add_ssl $name` will add to it:
`option uci_manage_ssl 'self-signed'`
`option ssl_certificate '/etc/nginx/conf.d/$name.crt'`
`option ssl_certificate_key '/etc/nginx/conf.d/$name.key'`
`option ssl_session_cache 'shared:SSL:32k'`
`option ssl_session_timeout '64m'`
If these options are already present, they will stay the
same; just the first option `uci_manage_ssl` will always be
changed to 'self-signed'. The command also changes all
`listen` list items to use port 443 and ssl instead of port
80 (without ssl). If they stated another port than 80
before, they are kept the same. Furthermore, it creates a
self-signed SSL certificate if necessary, i.e., if there is
no *valid* certificate and key at the locations given by
the options `ssl_certificate` and `ssl_certificate_key`.
* `nginx-util del_ssl $name` checks if `uci_manage_ssl` is
set 'self-signed' in the corresponding UCI section. Only
then it removes all of the above options regardless of the
value looking just at the key name. Then, it also changes
all `listen` list items to use port 80 (without ssl)
instead of port 443 with ssl. If stating another port than
443, they are kept the same. Furthermore, it removes the
SSL certificate and key that were indicated by
`ssl_certificate{,_key}`.
* `nginx-util check_ssl` looks through all server sections
of the UCI config for `uci_manage_ssl 'self-signed'`. On
every hit it checks if the SSL certificate-key-pair
indicated by the options `ssl_certificate{,_key}` is
expired. Then it re-creates a self-signed certificate.
If there exists at least one `section server` with
`uci_manage_ssl 'self-signed'`, it will try to install
itself as cron job. If there are no such sections, it
removes that cron job if possible.
For installing a ssl certificate and key managed by
another app, you can call:
`nginx-util add_ssl $name $manager $crtpath $keypath`
Hereby `$name` is as above, `$manager` is an arbitrary
string, and the the ssl certificate and its key are
indicated by their absolute path. If you want to remove
the directives again, then you can use:
`nginx-util del_ssl $name $manager`
Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
172 lines
4.5 KiB
YAML
172 lines
4.5 KiB
YAML
---
|
|
Language: Cpp
|
|
AccessModifierOffset: -2
|
|
AlignAfterOpenBracket: Align
|
|
AlignConsecutiveMacros: false
|
|
AlignConsecutiveAssignments: false
|
|
AlignConsecutiveDeclarations: false
|
|
AlignEscapedNewlines: Left
|
|
AlignOperands: true
|
|
AlignTrailingComments: true
|
|
AllowAllArgumentsOnNextLine: true
|
|
AllowAllConstructorInitializersOnNextLine: true
|
|
AllowAllParametersOfDeclarationOnNextLine: false
|
|
AllowShortBlocksOnASingleLine: Always
|
|
AllowShortCaseLabelsOnASingleLine: true
|
|
# AllowShortEnumsOnASingleLine: true
|
|
AllowShortLambdasOnASingleLine: All
|
|
AllowShortFunctionsOnASingleLine: Inline
|
|
AllowShortIfStatementsOnASingleLine: Always
|
|
AllowShortLoopsOnASingleLine: true
|
|
AlwaysBreakAfterDefinitionReturnType: None
|
|
AlwaysBreakAfterReturnType: None
|
|
AlwaysBreakBeforeMultilineStrings: true
|
|
AlwaysBreakTemplateDeclarations: Yes
|
|
BinPackArguments: true
|
|
BinPackParameters: false
|
|
# BitFieldColonSpacing: After
|
|
BreakBeforeBraces: Custom
|
|
BraceWrapping:
|
|
AfterCaseLabel: false
|
|
AfterClass: false
|
|
AfterControlStatement: MultiLine
|
|
AfterEnum: false
|
|
AfterFunction: true
|
|
AfterNamespace: false
|
|
AfterObjCDeclaration: false
|
|
AfterStruct: false
|
|
AfterUnion: false
|
|
AfterExternBlock: false
|
|
BeforeCatch: true
|
|
BeforeElse: true
|
|
# BeforeLambdaBody: true
|
|
# BeforeWhile: false
|
|
IndentBraces: false
|
|
SplitEmptyFunction: false
|
|
SplitEmptyRecord: false
|
|
SplitEmptyNamespace: false
|
|
BreakBeforeBinaryOperators: None
|
|
BreakBeforeInheritanceComma: false
|
|
BreakInheritanceList: BeforeColon
|
|
BreakBeforeTernaryOperators: true
|
|
BreakConstructorInitializersBeforeComma: false
|
|
BreakConstructorInitializers: BeforeColon
|
|
BreakAfterJavaFieldAnnotations: false
|
|
BreakStringLiterals: true
|
|
ColumnLimit: 100
|
|
CommentPragmas: '^ IWYU pragma:'
|
|
CompactNamespaces: false
|
|
ConstructorInitializerAllOnOneLineOrOnePerLine: true
|
|
ConstructorInitializerIndentWidth: 4
|
|
ContinuationIndentWidth: 4
|
|
Cpp11BracedListStyle: true
|
|
DeriveLineEnding: true
|
|
DerivePointerAlignment: false
|
|
DisableFormat: false
|
|
ExperimentalAutoDetectBinPacking: false
|
|
FixNamespaceComments: true
|
|
ForEachMacros:
|
|
- foreach
|
|
- Q_FOREACH
|
|
- BOOST_FOREACH
|
|
IncludeBlocks: Preserve
|
|
IncludeCategories:
|
|
- Regex: '^<ext/.*\.h>'
|
|
Priority: 2
|
|
SortPriority: 0
|
|
- Regex: '^<.*\.h>'
|
|
Priority: 1
|
|
SortPriority: 0
|
|
- Regex: '^<.*'
|
|
Priority: 2
|
|
SortPriority: 0
|
|
- Regex: '.*'
|
|
Priority: 3
|
|
SortPriority: 0
|
|
IncludeIsMainRegex: '([-_](test|unittest))?$'
|
|
IncludeIsMainSourceRegex: ''
|
|
IndentCaseLabels: true
|
|
IndentGotoLabels: true
|
|
IndentPPDirectives: None
|
|
IndentWidth: 4
|
|
IndentWrappedFunctionNames: false
|
|
JavaScriptQuotes: Leave
|
|
JavaScriptWrapImports: true
|
|
KeepEmptyLinesAtTheStartOfBlocks: false
|
|
MacroBlockBegin: ''
|
|
MacroBlockEnd: ''
|
|
MaxEmptyLinesToKeep: 1
|
|
NamespaceIndentation: None
|
|
ObjCBinPackProtocolList: Never
|
|
ObjCBlockIndentWidth: 2
|
|
ObjCSpaceAfterProperty: false
|
|
ObjCSpaceBeforeProtocolList: true
|
|
PenaltyBreakAssignment: 2
|
|
PenaltyBreakBeforeFirstCallParameter: 1
|
|
PenaltyBreakComment: 300
|
|
PenaltyBreakFirstLessLess: 120
|
|
PenaltyBreakString: 1000
|
|
PenaltyBreakTemplateDeclaration: 10
|
|
PenaltyExcessCharacter: 1000000
|
|
PenaltyReturnTypeOnItsOwnLine: 200
|
|
PointerAlignment: Left
|
|
RawStringFormats:
|
|
- Language: Cpp
|
|
Delimiters:
|
|
- cc
|
|
- CC
|
|
- cpp
|
|
- Cpp
|
|
- CPP
|
|
- 'c++'
|
|
- 'C++'
|
|
CanonicalDelimiter: ''
|
|
BasedOnStyle: google
|
|
- Language: TextProto
|
|
Delimiters:
|
|
- pb
|
|
- PB
|
|
- proto
|
|
- PROTO
|
|
EnclosingFunctions:
|
|
- EqualsProto
|
|
- EquivToProto
|
|
- PARSE_PARTIAL_TEXT_PROTO
|
|
- PARSE_TEST_PROTO
|
|
- PARSE_TEXT_PROTO
|
|
- ParseTextOrDie
|
|
- ParseTextProtoOrDie
|
|
CanonicalDelimiter: ''
|
|
BasedOnStyle: google
|
|
ReflowComments: true
|
|
SortIncludes: true
|
|
SortUsingDeclarations: true
|
|
SpaceAfterCStyleCast: false
|
|
SpaceAfterLogicalNot: false
|
|
SpaceAfterTemplateKeyword: true
|
|
SpaceBeforeAssignmentOperators: true
|
|
SpaceBeforeCpp11BracedList: false
|
|
SpaceBeforeCtorInitializerColon: true
|
|
SpaceBeforeInheritanceColon: true
|
|
SpaceBeforeParens: ControlStatements
|
|
SpaceBeforeRangeBasedForLoopColon: true
|
|
SpaceInEmptyBlock: false
|
|
SpaceInEmptyParentheses: false
|
|
SpacesBeforeTrailingComments: 2
|
|
SpacesInAngles: false
|
|
SpacesInConditionalStatement: false
|
|
SpacesInContainerLiterals: true
|
|
SpacesInCStyleCastParentheses: false
|
|
SpacesInParentheses: false
|
|
SpacesInSquareBrackets: false
|
|
SpaceBeforeSquareBrackets: false
|
|
Standard: Auto
|
|
StatementMacros:
|
|
- Q_UNUSED
|
|
- QT_REQUIRE_VERSION
|
|
TabWidth: 4
|
|
UseCRLF: false
|
|
UseTab: Never
|
|
...
|
|
|