Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
276efbfeae | ||
|
|
eabbb17fa5 | ||
|
|
37066552b8 | ||
|
|
fb681a846e | ||
|
|
dcf291de25 |
2
.github/dependabot.yml
vendored
2
.github/dependabot.yml
vendored
@@ -5,10 +5,12 @@ version: 2
|
|||||||
updates:
|
updates:
|
||||||
- package-ecosystem: github-actions
|
- package-ecosystem: github-actions
|
||||||
directory: /
|
directory: /
|
||||||
|
groups: {any: {patterns: ['*']}}
|
||||||
schedule: {interval: monthly}
|
schedule: {interval: monthly}
|
||||||
assignees: [tarampampam]
|
assignees: [tarampampam]
|
||||||
|
|
||||||
- package-ecosystem: docker
|
- package-ecosystem: docker
|
||||||
directory: /
|
directory: /
|
||||||
|
groups: {any: {patterns: ['*']}}
|
||||||
schedule: {interval: monthly}
|
schedule: {interval: monthly}
|
||||||
assignees: [tarampampam]
|
assignees: [tarampampam]
|
||||||
|
|||||||
2
.github/workflows/dependabot.yml
vendored
2
.github/workflows/dependabot.yml
vendored
@@ -12,7 +12,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.actor == 'dependabot[bot]' }}
|
if: ${{ github.actor == 'dependabot[bot]' }}
|
||||||
steps:
|
steps:
|
||||||
- uses: dependabot/fetch-metadata@v1
|
- uses: dependabot/fetch-metadata@v2
|
||||||
id: metadata
|
id: metadata
|
||||||
with: {github-token: "${{ secrets.GITHUB_TOKEN }}"}
|
with: {github-token: "${{ secrets.GITHUB_TOKEN }}"}
|
||||||
|
|
||||||
|
|||||||
@@ -27,12 +27,13 @@ auth strong
|
|||||||
allow {{ auth.login }}{{#auth.extra_accounts.*}},{{ * }}{{/auth.extra_accounts.*}}
|
allow {{ auth.login }}{{#auth.extra_accounts.*}},{{ * }}{{/auth.extra_accounts.*}}
|
||||||
{{/auth.password=}}{{/auth.login=}}
|
{{/auth.password=}}{{/auth.login=}}
|
||||||
|
|
||||||
proxy -a -p{{ ports.proxy }}
|
{{^extra_config=}}
|
||||||
socks -a -p{{ ports.socks }}
|
|
||||||
|
|
||||||
flush{{^extra_config=}}
|
|
||||||
|
|
||||||
# Additional configuration
|
# Additional configuration
|
||||||
{{extra_config}}
|
{{extra_config}}
|
||||||
{{/extra_config=}}
|
{{/extra_config=}}
|
||||||
|
|
||||||
|
proxy -a -p{{ ports.proxy }}
|
||||||
|
socks -a -p{{ ports.socks }}
|
||||||
|
|
||||||
|
flush
|
||||||
|
|||||||
@@ -4,6 +4,14 @@ All notable changes to this package will be documented in this file.
|
|||||||
|
|
||||||
The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].
|
The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].
|
||||||
|
|
||||||
|
## v1.9.1
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Extra configuration now applies before defining the proxy server in the configuration file [#49]
|
||||||
|
|
||||||
|
[#49]:https://github.com/tarampampam/3proxy-docker/pull/49
|
||||||
|
|
||||||
## v1.9.0
|
## v1.9.0
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ Image: ghcr.io/tarampampam/3proxy:1.8.2
|
|||||||
| `MAX_CONNECTIONS` | Maximal connections count (`1024` by default) | `2056` |
|
| `MAX_CONNECTIONS` | Maximal connections count (`1024` by default) | `2056` |
|
||||||
| `PROXY_PORT` | HTTP proxy port number (`3128` by default) | `8080` |
|
| `PROXY_PORT` | HTTP proxy port number (`3128` by default) | `8080` |
|
||||||
| `SOCKS_PORT` | SOCKS proxy port number (`1080` by default) | `8888` |
|
| `SOCKS_PORT` | SOCKS proxy port number (`1080` by default) | `8888` |
|
||||||
| `EXTRA_CONFIG` | Additional 3proxy configuration (will be added to the **end** of the config file) | `log /dev/stdout` |
|
| `EXTRA_CONFIG` | Additional 3proxy configuration (will be added to the **end** of the config file) | `# line 1\n# line 2` |
|
||||||
|
|
||||||
## How can I use this?
|
## How can I use this?
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user