-
-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #130 from intelowlproject/develop
* adjusted dependabot config * Bump library/nginx from 1.21.1-alpine to 1.23.4-alpine in /docker (#118) Bumps library/nginx from 1.21.1-alpine to 1.23.4-alpine. --- updated-dependencies: - dependency-name: library/nginx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update drf-spectacular requirement in /requirements (#119) Updates the requirements on [drf-spectacular](https://github.com/tfranzel/drf-spectacular) to permit the latest version. - [Release notes](https://github.com/tfranzel/drf-spectacular/releases) - [Changelog](https://github.com/tfranzel/drf-spectacular/blob/master/CHANGELOG.rst) - [Commits](tfranzel/drf-spectacular@0.22.0...0.26.1) --- updated-dependencies: - dependency-name: drf-spectacular dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * added twitter publish * Update certego-saas requirement from ~=0.2.0 to ~=0.5.0 in /requirements (#124) Updates the requirements on [certego-saas](https://github.com/certego/certego-saas) to permit the latest version. - [Release notes](https://github.com/certego/certego-saas/releases) - [Commits](certego/certego-saas@0.2.0...0.5.0) --- updated-dependencies: - dependency-name: certego-saas dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump myst-parser from 0.17.0 to 1.0.0 in /requirements (#120) Bumps [myst-parser](https://github.com/executablebooks/MyST-Parser) from 0.17.0 to 1.0.0. - [Release notes](https://github.com/executablebooks/MyST-Parser/releases) - [Changelog](https://github.com/executablebooks/MyST-Parser/blob/master/CHANGELOG.md) - [Commits](executablebooks/MyST-Parser@v0.17.0...v1.0.0) --- updated-dependencies: - dependency-name: myst-parser dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * added healthchecks * fixed nginx location * added back uwsgi and uwsgitop * added stag override * uwsgi adjustments * adjusted uwsgi path and removed healthcheck for celery * fixed uwsgi installation in alpine --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
- Loading branch information
Showing
17 changed files
with
79 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
permissions: read-all | ||
name: publish-to-twitter | ||
on: | ||
release: | ||
types: [released] | ||
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: infraway/[email protected] | ||
with: | ||
status: "published #IntelOwl ${{github.ref_name}}! https://github.com/intelowlproject/GreedyBear/releases/tag/${{github.ref_name}} #ThreatIntelligence #CyberSecurity #OpenSource #osint #honeypot #tpot" | ||
api_key: ${{ secrets.TWITTER_API_KEY }} | ||
api_key_secret: ${{ secrets.TWITTER_API_KEY_SECRET }} | ||
access_token: ${{ secrets.TWITTER_ACCESS_TOKEN }} | ||
access_token_secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
location /hc { | ||
return 200; | ||
} | ||
|
||
location = /favicon.ico { | ||
access_log off; | ||
log_not_found off; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,5 +23,3 @@ reload-on-rss = 2048 | |
worker-reload-mercy = 3600 | ||
|
||
buffer-size = 32768 | ||
|
||
need-app = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
REACT_APP_GREEDYBEAR_VERSION="v1.1.0" | ||
REACT_APP_GREEDYBEAR_VERSION="v1.1.1" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,11 @@ | ||
FROM library/nginx:1.21.1-alpine | ||
FROM library/nginx:1.23.4-alpine | ||
RUN mkdir -p /var/cache/nginx /var/cache/nginx/feeds | ||
RUN apk update && apk upgrade && apk add bash | ||
ENV NGINX_LOG_DIR /var/log/nginx | ||
# this is to avoid having these logs redirected to stdout/stderr | ||
RUN rm $NGINX_LOG_DIR/access.log $NGINX_LOG_DIR/error.log | ||
RUN touch $NGINX_LOG_DIR/access.log $NGINX_LOG_DIR/error.log | ||
RUN chown 33:33 $NGINX_LOG_DIR/access.log $NGINX_LOG_DIR/error.log | ||
VOLUME $NGINX_LOG_DIR | ||
VOLUME $NGINX_LOG_DIR | ||
|
||
HEALTHCHECK --interval=3s --start-period=2s --timeout=2s --retries=5 CMD curl --fail http://localhost/hc || exit 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
version: '3.8' | ||
|
||
services: | ||
uwsgi: | ||
image: intelowlproject/greedybear:stag | ||
|
||
nginx: | ||
image: intelowlproject/greedybear_nginx:stag | ||
|
||
celery_beat: | ||
image: intelowlproject/greedybear:stag | ||
|
||
celery_worker_default: | ||
image: intelowlproject/greedybear:stag |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters