Skip to content
This repository has been archived by the owner on Jun 13, 2022. It is now read-only.

Commit

Permalink
replace tabs with spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
ciphax committed Mar 1, 2019
1 parent 9b20c50 commit 6d81080
Show file tree
Hide file tree
Showing 15 changed files with 614 additions and 613 deletions.
6 changes: 4 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/.git/
/.vscode
/.git
/.gitignore
/.travis-yml
/target
/LICENSE.txt
/README.md
/README.md
/config.json
7 changes: 3 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ root = true
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = false
indent_style = tab
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.yml]
indent_style = space
indent_size = 2
indent_size = 2
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ deploy:
- deploy/*
skip_cleanup: true
on:
tags: true
tags: true
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ repository = "https://github.com/kegato/letsencrypt-inwx"
depends = ""
extended-description = "A small cli utility for automating the letsencrypt dns-01 challenge for domains hosted by inwx. The dns-01 challenge is required for obtaining wildcard certificates from letsencrypt."
assets = [
["target/release/letsencrypt-inwx", "usr/bin/", "755"],
["etc/certbot-inwx-auth", "usr/lib/letsencrypt-inwx/", "755"],
["etc/certbot-inwx-cleanup", "usr/lib/letsencrypt-inwx/", "755"]
["target/release/letsencrypt-inwx", "usr/bin/", "755"],
["etc/certbot-inwx-auth", "usr/lib/letsencrypt-inwx/", "755"],
["etc/certbot-inwx-cleanup", "usr/lib/letsencrypt-inwx/", "755"]
]

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
42 changes: 21 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,27 @@ You can store the configuration file at `/etc/letsencrypt-inwx.json` or at `~/.c
The configuration file should look like this (without the comments):
```json
{
"accounts": [
{
"username": "user",
"password": "pass",
// optional, if the domain is not configured all accounts will be tried
"domains": [
"example.com"
],
// optional, if true the public inwx test server will be used
"ote": false
}
],
// optional
"options": {
// optional, if true letsencrypt-inwx will not wait until the created record is publicly visible, default: false
"no_dns_check": false,
// optional, the amount of time in seconds to wait after creating a record, default: 5 seconds
"wait_interval": 5,
// optional: the dns server to use, default: the google public dns server
"dns_server": "8.8.8.8"
}
"accounts": [
{
"username": "user",
"password": "pass",
// optional, if the domain is not configured all accounts will be tried
"domains": [
"example.com"
],
// optional, if true the public inwx test server will be used
"ote": false
}
],
// optional
"options": {
// optional, if true letsencrypt-inwx will not wait until the created record is publicly visible, default: false
"no_dns_check": false,
// optional, the amount of time in seconds to wait after creating a record, default: 5 seconds
"wait_interval": 5,
// optional: the dns server to use, default: the google public dns server
"dns_server": "8.8.8.8"
}
}
```

Expand Down
2 changes: 1 addition & 1 deletion etc/certbot-inwx-auth
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
CONFIG_PATH=/etc/letsencrypt-inwx.json

if [ -f ~/.config/letsencrypt-inwx.json ]; then
CONFIG_PATH=~/.config/letsencrypt-inwx.json
CONFIG_PATH=~/.config/letsencrypt-inwx.json
fi

/usr/bin/letsencrypt-inwx create -c $CONFIG_PATH -d "_acme-challenge.$CERTBOT_DOMAIN" -v "$CERTBOT_VALIDATION"
2 changes: 1 addition & 1 deletion etc/certbot-inwx-cleanup
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
CONFIG_PATH=/etc/letsencrypt-inwx.json

if [ -f ~/.config/letsencrypt-inwx.json ]; then
CONFIG_PATH=~/.config/letsencrypt-inwx.json
CONFIG_PATH=~/.config/letsencrypt-inwx.json
fi

/usr/bin/letsencrypt-inwx delete -c $CONFIG_PATH -d "_acme-challenge.$CERTBOT_DOMAIN"
18 changes: 9 additions & 9 deletions etc/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@
CONF_CREATED=false

if [ ! -z "$INWX_USER" -a ! -z "$INWX_PASSWD" ]; then
CONF_CREATED=true
>&2 echo "\
CONF_CREATED=true
>&2 echo "\
!!! WARNING !!!
PASSING INWX_USER AND INWX_PASSWD AS ENV VARIABLES IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE!
You should mount a config file into the container instead. See https://github.com/kegato/letsencrypt-inwx for details.
"
cat << EOF > /etc/letsencrypt-inwx.json
cat << EOF > /etc/letsencrypt-inwx.json
{
"accounts": [{
"username": "$INWX_USER",
"password": "$INWX_PASSWD"
}]
"accounts": [{
"username": "$INWX_USER",
"password": "$INWX_PASSWD"
}]
}
EOF
chmod 600 /etc/letsencrypt-inwx.json
chmod 600 /etc/letsencrypt-inwx.json
fi

set -x
certbot -n --agree-tos $@
set +x

if [ $CONF_CREATED = true ]; then
rm /etc/letsencrypt-inwx.json
rm /etc/letsencrypt-inwx.json
fi
Loading

0 comments on commit 6d81080

Please sign in to comment.