Skip to content

Commit

Permalink
Rename master branch to 'main'
Browse files Browse the repository at this point in the history
  • Loading branch information
evilaliv3 committed Jul 8, 2020
1 parent 2a085df commit 623ce40
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
## Build
| Branch | Status | Quality | Coverage | Browser Tests
| :---: | :---: | :---: | :---: | :---: |
| [master](https://github.com/globaleaks/GlobaLeaks/tree/master) | [![Build Status](https://travis-ci.org/globaleaks/GlobaLeaks.svg?branch=master)](https://travis-ci.org/globaleaks/GlobaLeaks) | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/4e072e7e5287478fa56468f3719d94ef?branch=master)](https://www.codacy.com/app/GlobaLeaks/GlobaLeaks) | [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/4e072e7e5287478fa56468f3719d94ef?branch=master)](https://www.codacy.com/app/GlobaLeaks/GlobaLeaks) | [![Browser Status](https://badges.herokuapp.com/sauce/globaleaks?tag=master&labels=none)](https://saucelabs.com/u/globaleaks)
| [main](https://github.com/globaleaks/GlobaLeaks/tree/main) | [![Build Status](https://travis-ci.org/globaleaks/GlobaLeaks.svg?branch=main)](https://travis-ci.org/globaleaks/GlobaLeaks) | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/4e072e7e5287478fa56468f3719d94ef?branch=main)](https://www.codacy.com/app/GlobaLeaks/GlobaLeaks) | [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/4e072e7e5287478fa56468f3719d94ef?branch=main)](https://www.codacy.com/app/GlobaLeaks/GlobaLeaks) | [![Browser Status](https://badges.herokuapp.com/sauce/globaleaks?tag=main&labels=none)](https://saucelabs.com/u/globaleaks)
| [devel](https://github.com/globaleaks/GlobaLeaks/tree/devel) | [![Build Status](https://travis-ci.org/globaleaks/GlobaLeaks.svg?branch=devel)](https://travis-ci.org/globaleaks/GlobaLeaks) | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/4e072e7e5287478fa56468f3719d94ef?branch=devel)](https://www.codacy.com/app/GlobaLeaks/GlobaLeaks) | [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/4e072e7e5287478fa56468f3719d94ef?branch=devel)](https://www.codacy.com/app/GlobaLeaks/GlobaLeaks) | [![Browser Status](https://badges.herokuapp.com/sauce/globaleaks?tag=devel&labels=none)](https://saucelabs.com/u/globaleaks)

## Documentation
Expand Down Expand Up @@ -42,6 +42,6 @@ To support the GlobaLeaks project you can help us with donations that will goes
[Help us by sending us a small donation!](https://www.globaleaks.org/donate)

## License
This software is released under the AGPLv3 license. See [LICENSE file](https://github.com/globaleaks/GlobaLeaks/blob/master/LICENSE) for more information on Additional Terms as per [7(b)](https://github.com/globaleaks/GlobaLeaks/blob/master/LICENSE#L684) and [7(c)](https://github.com/globaleaks/GlobaLeaks/blob/master/LICENSE#L713).
This software is released under the AGPLv3 license. See [LICENSE file](https://github.com/globaleaks/GlobaLeaks/blob/main/LICENSE) for more information on Additional Terms as per [7(b)](https://github.com/globaleaks/GlobaLeaks/blob/main/LICENSE#L684) and [7(c)](https://github.com/globaleaks/GlobaLeaks/blob/main/LICENSE#L713).

Copyright (c) 2011-2020 - [Hermes Center for Transparency and Digital Human Rights](https://www.hermescenter.org)
2 changes: 1 addition & 1 deletion client/app/views/partials/enable_encryption.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</div>
<div class="modal-body">
<div class="alert alert-danger">
<span data-translate>Before proceeding please read carefully the documentation at:</span> <a href="https://docs.globaleaks.org/en/master/gettingstarted/Encryption.html" target="_blank" rel="noreferrer noopener">Encryption</a>
<span data-translate>Before proceeding please read carefully the documentation at:</span> <a href="https://docs.globaleaks.org/en/main/security/EncryptionProtocol.html" target="_blank" rel="noreferrer noopener">Encryption</a>
</div>
</div>
<div class="modal-footer">
Expand Down
2 changes: 1 addition & 1 deletion documentation/gettingstarted/Features.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Legal Features
- GDPR compliant subscriber module for new users of SAAS services
- No logs of IP addresses
- Integratable with existing enterprise case management platform
- Free Software OSI Approved `AGPL 3.0 License <https://github.com/globaleaks/GlobaLeaks/blob/master/LICENSE>`_
- Free Software OSI Approved `AGPL 3.0 License <https://github.com/globaleaks/GlobaLeaks/blob/main/LICENSE>`_

Security Features
=================
Expand Down
4 changes: 2 additions & 2 deletions documentation/security/ApplicationSecurity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -301,14 +301,14 @@ GlobaLeaks integrates iptables by default and implements by a strict firewall ru

As well it automatically applies network sandboxing to all outbound communications that get automatically "torrified" (sent through Tor), being outbound TCP connections or DNS-query for name resolution.

The configuration of the network sandboxing is defined inside the init script of the application: https://github.com/globaleaks/GlobaLeaks/blob/master/debian/globaleaks.init
The configuration of the network sandboxing is defined inside the init script of the application: https://github.com/globaleaks/GlobaLeaks/blob/main/debian/globaleaks.init

Application sandboxing
======================
GlobaLeaks integrates AppArmor by default and implements a strict sandboxing profile enabling the application to access only the strictly required files.
As well the application does run under a dedicated user and group "globaleaks" with reduced privileges.

The configuration of the network sandboxing is defined inside the init script of the application: https://github.com/globaleaks/GlobaLeaks/blob/master/debian/apparmor/usr.bin.globaleaks
The configuration of the network sandboxing is defined inside the init script of the application: https://github.com/globaleaks/GlobaLeaks/blob/main/debian/apparmor/usr.bin.globaleaks

Other measures
==============
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

TARGETS="buster focal bionic"
DISTRIBUTION="buster"
TAG="master"
TAG="main"
LOCAL_ENV=0
NOSIGN=0
PUSH=0
Expand Down
4 changes: 2 additions & 2 deletions scripts/setup_development_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# this force to exit at first error returned
set -e

TAG="master"
TAG="main"

# Redirect stdout ( > ) into a named pipe ( >() ) running "tee"
exec > >(tee -i ./setup_log.txt)
Expand Down Expand Up @@ -61,7 +61,7 @@ sudo apt-get update
sudo apt-get install curl dh-apparmor debhelper devscripts dput git libssl-dev python3-dev python3-pip python3-setuptools python3-sphinx python3-venv

git clone https://github.com/globaleaks/GlobaLeaks.git
if [ "$TAG" != "master"]; then
if [ "$TAG" != "main"]; then
cd GlobaLeaks/ && git checkout $TAG && cd ..
fi

Expand Down

0 comments on commit 623ce40

Please sign in to comment.