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.

Sign up for GitHub

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

Change install log location and restrict permissions #74

Merged
merged 21 commits into from
Nov 22, 2022
Merged

Change install log location and restrict permissions #74

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a64ec07
Change install log location and restrict permissions
Dean-Coakley Oct 13, 2022
5427632
Add deps
Dean-Coakley Oct 13, 2022
c049ca2
Update ci stage deps
Dean-Coakley Oct 13, 2022
ac3dff6
Revert lint stage ubuntu upgrade
Dean-Coakley Oct 13, 2022
40dc765
Remove test-install stage until open source
Dean-Coakley Oct 13, 2022
7e9f883
Restrict writing to log file
Dean-Coakley Oct 13, 2022
4b07b69
Lint and make deps
Dean-Coakley Oct 14, 2022
d7fcacf
Fix creation of log dir for initial installs
Dean-Coakley Oct 18, 2022
3f88e5b
Fix create log dir if unset
Dean-Coakley Oct 19, 2022
a23807a
Refactor: Mkdir unconditionally
Dean-Coakley Oct 19, 2022
a7e55e6
Fix include postinstall content in install log
Dean-Coakley Oct 21, 2022
3af76cb
Merge branch 'main' into fix-logfile-installlog
Dean-Coakley Oct 21, 2022
5d37937
Fix preinstall status codes. Remove excessive output
Dean-Coakley Nov 7, 2022
7f5ebfe
Fix FreeBSD uninstall
Dean-Coakley Nov 7, 2022
542e6c1
Fix FreeBSD package to include preinstall step
Dean-Coakley Nov 7, 2022
17570d9
Fix ensure path. Simply ensure agent path
Dean-Coakley Nov 7, 2022
f913d30
Lint
Dean-Coakley Nov 7, 2022
a7376d7
Move install log creation
Dean-Coakley Nov 7, 2022
3137b88
Remove unreachable dyn-config check
Dean-Coakley Nov 8, 2022
8b0810d
Remove install log
Dean-Coakley Nov 9, 2022
2b78034
Preinstall should now creawte log dir on FreeBSD
Dean-Coakley Nov 21, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ on:
push:

env:
GOLANGCI_LINT_VERSION: 'v1.46.2'
NFPM_VERSION: 'v2.18.0'
GOLANGCI_LINT_VERSION: 'v1.49.0'
NFPM_VERSION: 'v2.18.1'

jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion .nfpm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ contents:
- src: nginx-agent.conf
dst: /etc/nginx-agent/nginx-agent.conf
file_info:
mode: 0660
mode: 0640
- src: ./scripts/packages/nginx-agent.service
dst: /etc/systemd/system/nginx-agent.service
- src: ./scripts/selinux/nginx_agent_selinux.8.gz
Expand Down
2 changes: 1 addition & 1 deletion scripts/.local-nfpm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ contents:
- src: nginx-agent.conf
dst: /etc/nginx-agent/nginx-agent.conf
file_info:
mode: 0660
mode: 0640
- src: ./scripts/packages/nginx-agent.service
dst: /etc/systemd/system/nginx-agent.service
- src: ./scripts/selinux/nginx_agent_selinux.8.gz
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ RUN --mount=type=secret,id=nginx-crt,dst=/etc/apk/cert.pem \
nginx-agent \
" \
&& apk update \
&& apk add $nginxPackages
&& apk add $nginxPackages

# run the nginx and agent
FROM install as runtime
Expand Down
2 changes: 1 addition & 1 deletion scripts/packages/nginx-agent
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ start_cmd="start_agent"
stop_cmd="stop_agent"
status_cmd="status_agent"


start_agent() {
PATH=$PATH:/usr/local/sbin
mkdir -p /var/log/nginx-agent
/usr/sbin/daemon -f -p ${pidfile} ${command}
}

Expand Down
1 change: 1 addition & 0 deletions scripts/packages/packager/local-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ mkdir -p /staging/usr/local/etc/rc.d

cp nginx-agent.conf /staging/usr/local/etc/nginx-agent
cp scripts/packages/nginx-agent /staging/usr/local/etc/rc.d
cp scripts/packages/preinstall.sh /staging/+PRE_INSTALL
cp scripts/packages/postremove.sh /staging/+PRE_DEINSTALL
cp scripts/packages/postinstall.sh /staging/+POST_INSTALL
cp scripts/packages/plist /staging
Expand Down
1 change: 1 addition & 0 deletions scripts/packages/packager/signed-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ mkdir -p staging/usr/local/etc/rc.d

cp nginx-agent.conf staging/usr/local/etc/nginx-agent
cp scripts/packages/nginx-agent staging/usr/local/etc/rc.d
cp scripts/packages/preinstall.sh /staging/+PRE_INSTALL
cp scripts/packages/postremove.sh staging/+PRE_DEINSTALL
cp scripts/packages/postinstall.sh staging/+POST_INSTALL
cp scripts/packages/plist staging
Expand Down
Loading