Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Naming fixups #108

Merged
merged 2 commits into from
May 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Copyright (c) 2002-2015 Balabit
Copyright (c) 1996-2015 Balázs Scheidler
Copyright (c) 2023-2024 Axoflow

syslog-ng is licensed under the combination of the GPL and LGPL licenses.
AxoSyslog is licensed under the combination of the GPL and LGPL licenses.

Our intention with the choice of our licenses is to:
1) license reusable/extendable code under the LGPL,
Expand All @@ -21,7 +21,7 @@ Alternatively, you can also use the contents of the `tests/copyright/policy`
file, this is an input to our automated test suite that checks licenses
against our intents.

The syslog-ng core contained in the following subdirectories
The AxoSyslog core contained in the following subdirectories
is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
Expand All @@ -35,7 +35,7 @@ syslog-ng-ctl/
persist-tool/
tests/loggen/

The syslog-ng modules (modules/, docker/, charts/, and scl/ subdirectories,
The AxoSyslog modules (modules/, docker/, charts/, and scl/ subdirectories,
except the ones that declare LGPL-2.1-or-later in their license notices)
is free software; you can redistribute it and/or modify it under the terms of
the GNU General Public License version 2 as published by the
Expand All @@ -48,8 +48,8 @@ FAQ:
The questions and answers below try to summarize the intentions behind this
licensing scheme.

Q: Is it possible to create derived works of syslog-ng under the GPL/LGPL
licenses?
Q: Is it possible to create derived works of AxoSyslog/syslog-ng under the
GPL/LGPL licenses?

A: Yes, that's exactly the point of open source. Works derived from the
plugins will have to use the GPL license, but you can choose to use LGPL for
Expand All @@ -61,16 +61,16 @@ contribution to be accepted?
A: No, starting with syslog-ng 3.2, you don't need to sign a CLA in order to
have your contributions accepted.

Q: Is it possible to create non-free plugins for syslog-ng?
Q: Is it possible to create non-free plugins for AxoSyslog/syslog-ng?

A: Yes. It is our understanding that plugins are derived works of the
syslog-ng core but not derived works of other plugins. Thus, non-free
AxoSyslog core but not derived works of other plugins. Thus, non-free
plugins are possible, provided they do not link to any of the GPLd plugins
explicitly and the only connection between two plugins is via the syslog-ng
explicitly and the only connection between two plugins is via the AxoSyslog
core.

Q: Who is permitted to create non-free plugins for syslog-ng? Is it just
BalaBit (the current copyright holder as of the initial 3.2 release)?
Q: Who is permitted to create non-free plugins for AxoSyslog/syslog-ng?
Is it just BalaBit (the current copyright holder as of the initial 3.2 release)?

A: No, everyone including BalaBit.

Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ style-format:
$(top_srcdir)/scripts/style-checker.sh format $(top_srcdir)

help:
@echo "Welcome to the syslog-ng build system!"
@echo "Welcome to the AxoSyslog build system!"
@echo
@echo "All of the standard targets are available:"
@echo " all, check, install, dist, distcheck, and clean"
Expand Down
2 changes: 1 addition & 1 deletion dbld/generate-debian-directory
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ MODE=$1
cp -r /source/packaging/debian .
if [ $MODE = "snapshot" ]; then
echo "Generating snapshot version in debian/"
DEBEMAIL="dev@null" DEBFULLNAME="syslog-ng snapshot" debchange --force-bad-version --newversion ${VERSION}-${MODE}+`date +%Y%m%dT%H%M%S` "Snapshot release based on ${GITREF}"
DEBEMAIL="dev@null" DEBFULLNAME="axosyslog snapshot" debchange --force-bad-version --newversion ${VERSION}-${MODE}+`date +%Y%m%dT%H%M%S` "Snapshot release based on ${GITREF}"
elif [ $MODE = "release" ]; then
echo "Validating if your debian/ directory matches current version"
DEB_VERSION=`dpkg-parsechangelog -S Version | cut -d - -f1`
Expand Down
2 changes: 1 addition & 1 deletion dbld/shell
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

echo -e "\n\nWelcome to the syslog-ng developer's shell... ($IMAGE_PLATFORM)\n"
echo -e "\n\nWelcome to the AxoSyslog developer's shell... ($IMAGE_PLATFORM)\n"

echo -e "You can find the source in /source, you can build the source using:\n"
echo -e "\t\$ cd /build"
Expand Down
2 changes: 1 addition & 1 deletion docker/python-modules/webhook/source.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def _construct_msg(self, request, path_arguments) -> LogMessage:
return msg

def set_default_headers(self) -> None:
self.set_header("Server", "syslog-ng");
self.set_header("Server", "axosyslog");

def get_current_user(self):
if not self.source.auth_token:
Expand Down
6 changes: 3 additions & 3 deletions modules/grpc/otel/otel-grammar.ym
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ GrpcClientCredentialsBuilderW *last_grpc_client_credentials_builder;
%token KW_URL
%token KW_TARGET_SERVICE_ACCOUNTS
%token KW_ADC
%token KW_SYSLOG_NG_OTLP
%token KW_AXOSYSLOG_OTLP
%token KW_COMPRESSION
%token KW_BATCH_BYTES
%token KW_CONCURRENT_REQUESTS
Expand All @@ -93,7 +93,7 @@ start

kw_opentelemetry_or_syslog_ng_otlp
: KW_OPENTELEMETRY
| KW_SYSLOG_NG_OTLP
| KW_AXOSYSLOG_OTLP
;

source_otel
Expand Down Expand Up @@ -182,7 +182,7 @@ destination_otel_channel_arg
;

destination_syslog_ng_otlp
: KW_SYSLOG_NG_OTLP
: KW_AXOSYSLOG_OTLP
{
last_driver = *instance = syslog_ng_otlp_dd_new(configuration);
}
Expand Down
3 changes: 2 additions & 1 deletion modules/grpc/otel/otel-parser.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ static CfgLexerKeyword otel_keywords[] =
{ "url", KW_URL },
{ "target_service_accounts", KW_TARGET_SERVICE_ACCOUNTS },
{ "adc", KW_ADC },
{ "syslog_ng_otlp", KW_SYSLOG_NG_OTLP },
{ "axosyslog_otlp", KW_AXOSYSLOG_OTLP },
{ "syslog_ng_otlp", KW_AXOSYSLOG_OTLP },
{ "compression", KW_COMPRESSION },
{ "batch_bytes", KW_BATCH_BYTES },
{ "concurrent_requests", KW_CONCURRENT_REQUESTS },
Expand Down
Loading
Loading