diff --git a/static/css/style.css b/static/css/style.css index d48240d..662fdcd 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -264,7 +264,7 @@ box-shadow: 1px 1px 2px 1px rgba(0,0,0,0.21); .content-box h3 { font-weight: bold; font-size: 1.2em; - margin: 0.5em 0 0.25em 0; + margin: 1em 0 0.25em 0; } .content-box h4 { font-weight: bold; @@ -463,15 +463,15 @@ ul.errorlist { } .install-guides li { display: inline-block; - width: 10em; - padding-top: 1em; + width: 7em; + padding-top: 0.5em; text-align: center; border: 1px solid #ccc; border-radius: 5px; - margin: 0.5em 1em; + margin: 0.5em 0.50em; } .install-guides li a { - line-height: 3em; + line-height: 2.2em; text-decoration: none; } .install-guides li i { diff --git a/templates/base_help.html b/templates/base_help.html index f91e4a6..3ab0a63 100644 --- a/templates/base_help.html +++ b/templates/base_help.html @@ -6,7 +6,7 @@
-

{% trans 'Help' %}

+

-

{% trans 'Installation' %}

+

{% trans 'OpenVPN' %}
diff --git a/templates/pages/help.en.md b/templates/pages/help.en.md index ea4f357..ec8467c 100644 --- a/templates/pages/help.en.md +++ b/templates/pages/help.en.md @@ -2,15 +2,29 @@ Title: Support --- +CCrypto VPN uses mainly two VPN technologies, +[OpenVPN](https://openvpn.net/) and +[WireGuard](https://www.wireguard.com/). +We recommend WireGuard for its simplicity, security, and performances, +but also provide OpenVPN servers for compatibility with many devices and setups. + +### WireGuard Installation Guide + +The most up to date installation instructions for WireGuard are on its official website: +[*Installation - Wireguard*](https://www.wireguard.com/install/). + +- On Android and iOS, simply open the app and scan a [QR code from your account page](/account/wireguard) to associate a device. +- On Windows, mac OS and Linux, import a configuration file [downloaded from your account](/account/wireguard). ### OpenVPN Installation Guides ### Help diff --git a/templates/pages/help.fr.md b/templates/pages/help.fr.md index dd80135..285161a 100644 --- a/templates/pages/help.fr.md +++ b/templates/pages/help.fr.md @@ -2,14 +2,29 @@ Title: Guides --- -### Installation d'OpenVPN +CCrypto VPN utilise principalement deux technologies de VPN, +[OpenVPN](https://openvpn.net/) et +[WireGuard](https://www.wireguard.com/). +Nous recommandons WireGuard pour sa simplicité, sécurité, et performances, +mais fournissons aussi des serveurs OpenVPN pour une compatibilité avec plus de plateformes. + +### Installation avec WireGuard + +Les instructions pour installer WireGuard sont disponibles sur le site officiel: +[Installation - WireGuard](https://www.wireguard.com/install/). + +- Sur Android and iOS, scannez simplement [le code QR donné dans votre compte](/account/wireguard) pour associer un appareil. +- Sur Windows, mac OS, et Linux, importez un fichier de configuration [téléchargé depuis votre compte](/account/wireguard). + +### Installation avec OpenVPN ### Aide diff --git a/templates/pages/install-openvpn.en.md b/templates/pages/install-openvpn.en.md new file mode 100644 index 0000000..da315a2 --- /dev/null +++ b/templates/pages/install-openvpn.en.md @@ -0,0 +1,48 @@ +--- +Title: Configure OpenVPN +--- + +Some devices will let you upload and import a VPN configuration; the "Other / GNU/Linux" configuration option is made to be compatible. + +For most other devices and client applications, including most routers supporting OpenVPN, you will need to fill in a few parameters as described below: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
OptionValue
CA CertificateThe file available on vpn.ccrypto.org/ca.crt
Client / Server certificatesNone
Username / PasswordThe same as used to log in on this website
Host or Gatewayfr.204vpn.net, or any host in our server list
Port / Protocol1196 in UDP mode (or 443 in TCP mode; prefer UDP unless blocked)
Interface Typetun
LZO CompressionEnabled
Cipher / HMACBF-CBC and SHA1 by default, renegociable with a recent OpenVPN version
DNS Server10.99.0.20
+ diff --git a/templates/pages/nop2p.en.md b/templates/pages/nop2p.en.md deleted file mode 100644 index 0aa4ed6..0000000 --- a/templates/pages/nop2p.en.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -Title: NO-P2P Servers ---- - -See also: our [Privacy Policy](/page/privacy). - -Because of its high number of simultaneous connections and high bandwidth usage, -and the amount of legal issues sometimes linked, -we have to restrict the use of the BitTorrent protocol on specific servers. -Our servers marked as **NO-P2P** are more expensive to maintain -and cost more in bandwidth than in other countries, -so we ask our clients to not use the BitTorrent protocol -on these servers. - - -### Enforcement - -As monitoring all connections would be a big privacy violation towards our clients and cost much more, -we chose to only intercept connection made to a specific set of known BitTorrent trackers -as listed at the end of this page. -Rules are then applied to the intercepted content and if a match if found, -the client is disconnected and banned from the server. -Intercepted data is never logged or stored, only the username and the date of detection are stored. - -If you think this has happened by mistake, please contact our support. - -Trackers targeted: - - 94.23.183.33 - 62.138.0.158 - 163.172.157.35 - 151.80.120.112/30 - 109.121.134.121 - 87.98.148.74 - 192.99.81.115 - -The exact rules used are still under development and will be published once stable. - diff --git a/templates/pages/privacy.en.md b/templates/pages/privacy.en.md index d2fb47c..bd0e35e 100644 --- a/templates/pages/privacy.en.md +++ b/templates/pages/privacy.en.md @@ -2,57 +2,45 @@ Title: Privacy Policy --- -We believe transparency is one of the most important qualities a VPN service can have. -This page is meant to inform users about what informations CCrypto stores, -in what conditions, and the exact limits under which it is kept and transfered. +This page is meant to inform users about the information CCrypto stores, +in what conditions, and the exact limits under which it is kept and transfered. If you have any question that is not answered by this page, please contact us. -### 1. Informations stored - -To run our VPN service, we collect and store the following informations: +### 1. Information stored - Username - - Hashed password (see our published source code for details) + - Hashed password - E-mail address, if provided - - Support tickets + - Messages sent as support tickets - IP address used when browsing the site + - For payments and subscriptions, external identifiers to the associated payment processors. -For each payment or subscription, we store: - - - PayPal: the PayPal transaction or subscription ID and paid amount - - Stripe: the Stripe charge or subscription ID and paid amount - - Bitcoin: the transaction id, receiving address and received amount at the time the payment was confirmed. - -All these informations are strictly kept by CCrypto and will not be shared to a third party, -except as described in section 4. +See our published source code for technical details. +We use no additional external analytics or advertisement network on our website. +All these informations are strictly kept by CCrypto and will not be shared to a third party unless required by law (see 4.). Our websites embeds a support chat widget operated by Tawk.to. It can be blocked -without breaking the rest of the website and tickets can be used for communication. - -We use no additional external analytics or advertisement network on our website. +without breaking the rest of the website and tickets can be used for secure communication. ### 2. VPN Logging -Each connection from a VPN client to our VPN server is logged for security and billing purposes. +Each connection from a VPN client to our OpenVPN servers is logged for legal reasons. For each connection or authentication, we store for up to a year: - Username - - Server used and shared server IP address - - Client IP address and port - - Amount of data transferred per hour (used exclusively for usage statistics and against extreme service abuses) + - Server used (and shared server IP address) + - OpenVPN client IP address and port + - Amount of data transferred per hour (used exclusively for usage statistics and against extreme abuses) -As opposed to many VPN service providers, no data is stored or logged in the gateway servers. -Those are too exposed and would be the easiest target to raid or steal, and depend on the -law of many countries. -Instead, connection logs are stored separately on a secure server. +**CCrypto will never monitor, record, or use without your consent the traffic you send and receive through the VPN, including but not limited to DNS queries and browsing history.** -**CCrypto will never, in any event, monitor, record, or use without your consent the traffic you send and receive through the VPN, including but not limited to DNS queries and browsing history.** +We will however watch for known dangerous patterns to limit abuse, +exclusively used internally to avoid issues with our current server providers: -On some servers, we will however watch for known dangerous patterns to limit abuse, -as explicitly described by a dedicated page: [NO-P2P](/page/nop2p) -Such detections are exclusively for use by CCrypto internally and will not be shared. +- Denial of service attacks +- BitTorrent connections to know public trackers (on servers indicated by a "NO-P2P" tag) ### 3. DMCA handling @@ -61,15 +49,11 @@ DMCA cease & desists are usually ignored as we have very little control over it. If one user generates too many abuse, we may investigate and block their access to a server without notice as a warning. -Since we cannot precisely identify users responsible from DMCA notices, +Since we cannot precisely identify users responsible for DMCA notices, we will ban from the server the user or users that match the most the report or reports received. If you think you have been banned unfairly, you can open a ticket and we will reinstate your access to the server as soon as possible. -Servers designated as "NO P2P" servers have a lower tolerance and -will result in a ban as fast as possible. -Please do not abuse the service, as it will only lower the quality for everyone. - **We will never disclose user information as a result of a DMCA notice.** ### 4. Data requests