Skip to content

Commit

Permalink
Merge branch 'release/0.12.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
nwtgck committed Jan 23, 2022
2 parents 14a5f64 + bb9794b commit 938942a
Show file tree
Hide file tree
Showing 9 changed files with 243 additions and 162 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
run: |
set -xeu
# Create certificates
mkdir ssl_certs && cd ssl_certs && openssl req -x509 -newkey rsa:4096 -keyout server.key -out server.crt -days 365 -sha256 -nodes --subj '/CN=localhost/' && cd -
(mkdir ssl_certs && cd ssl_certs && openssl req -x509 -newkey rsa:4096 -keyout server.key -out server.crt -days 365 -sha256 -nodes --subj '/CN=localhost/')
# Run a server
./piping-server-x86_64-unknown-linux-musl/piping-server --http-port=8181 --enable-https --https-port=8443 --crt-path=./ssl_certs/server.crt --key-path=./ssl_certs/server.key &
sleep 3
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
run: |
set -eux
# Create certificates
mkdir ssl_certs && cd ssl_certs && openssl req -x509 -newkey rsa:4096 -keyout server.key -out server.crt -days 365 -sha256 -nodes --subj '/CN=localhost/' && cd -
(mkdir ssl_certs && cd ssl_certs && openssl req -x509 -newkey rsa:4096 -keyout server.key -out server.crt -days 365 -sha256 -nodes --subj '/CN=localhost/')
# Run a server
docker run -d --name=piping -p 8181:80 -p 8443:443 -v $PWD/ssl_certs:/ssl_certs piping-server-rust --http-port=80 --enable-https --https-port=443 --crt-path=/ssl_certs/server.crt --key-path=/ssl_certs/server.key
# Wait for server running
Expand Down
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

## [Unreleased]

## [0.12.0] - 2022-01-23
### Changed
* Update dependencies
* Show version in index page
* Remove `action=""` when path is not filled for valid HTML in /noscript

### Added
* Add `--host` option to listen on specified address [#215](https://github.com/nwtgck/piping-server-rust/pull/215) by [@ml-](https://github.com/ml-)
* Support text input mode in /noscript page

### Fixed
* Remove GET action in /noscript page

## [0.11.0] - 2022-01-16
### Changed
* (Docker) Use Rust version 1.57.0 in build
Expand Down Expand Up @@ -198,7 +211,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
### Added
* Implement basic Piping Server

[Unreleased]: https://github.com/nwtgck/piping-server-rust/compare/v0.11.0...HEAD
[Unreleased]: https://github.com/nwtgck/piping-server-rust/compare/v0.12.0...HEAD
[0.12.0]: https://github.com/nwtgck/piping-server-rust/compare/v0.11.0...v0.12.0
[0.11.0]: https://github.com/nwtgck/piping-server-rust/compare/v0.10.2...v0.11.0
[0.10.2]: https://github.com/nwtgck/piping-server-rust/compare/v0.10.1...v0.10.2
[0.10.1]: https://github.com/nwtgck/piping-server-rust/compare/v0.10.0...v0.10.1
Expand Down
60 changes: 30 additions & 30 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "piping-server"
version = "0.11.0"
version = "0.12.0"
authors = ["Ryo Ota <[email protected]>"]
edition = "2018"

[dependencies]
hyper = { version = "0.14", features = ["stream", "server", "http1", "http2", "tcp"] }
futures = { version = "0.3", default-features = false, features = ["std"] }
clap = { version = "3.0.7", features = ["derive"] }
clap = { version = "3.0.10", features = ["derive"] }
http = "0.2"
tokio = { version = "1.15", features = ["rt-multi-thread", "macros", "net"] }
rustls = "0.20"
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,15 @@ cargo build --release
### Server-side help

```txt
piping-server 0.10.2
piping-server 0.12.0
Piping Server in Rust
USAGE:
piping-server [OPTIONS]
OPTIONS:
--host <HOST> Bind address, either IPv4 or IPv6 (e.g. 127.0.0.1, ::1)
[default: 0.0.0.0]
--http-port <HTTP_PORT> HTTP port [default: 8080]
--enable-https Enable HTTPS
--https-port <HTTPS_PORT> HTTPS port
Expand Down
105 changes: 0 additions & 105 deletions resource/index.html

This file was deleted.

Loading

0 comments on commit 938942a

Please sign in to comment.