Skip to content
GitLab
Commit 9f6da738 authored by erdnaxe's avatar erdnaxe 🦋
Browse files

Merge branch 'tempest' into 'master' 

Bye Cachan, welcome Saclay

See merge request !20
parents 736ea176 4954ca2b
Pipeline #9768 passed with stages
in 1 minute and 1 second
Hide whitespace changes
Inline Side-by-side
config.yml
View file @ 9f6da738
......@@ -18,12 +18,10 @@ languages:
link: "https://intranet.crans.org/users/mon_profil/#email"
- text: Hébergement web
link: "https://perso.crans.org/"
- text: Télévision IPTV
link: https://tv.crans.org/
- text: OwnCloud
link: https://owncloud.crans.org/
- text: Et plus encore...
link: https://intranet.crans.org/
link: https://services.crans.org/
column2:
title: Évènements
links:
......@@ -31,30 +29,6 @@ languages:
link: https://install-party.crans.org/
- text: Séminaires techniques
link: https://wiki.crans.org/CransTechnique/CransApprentis/SeminairesTechniques
en:
languageName: English
weight: 1
quicklinks:
column1:
title: Some services
links:
- text: Mail account
link: "https://intranet.crans.org/users/mon_profil/#email"
- text: Web hosting
link: "https://perso.crans.org/"
- text: IPTV
link: https://tv.crans.org/
- text: OwnCloud
link: https://owncloud.crans.org/
- text: And more...
link: https://intranet.crans.org/
column2:
title: Events
links:
- text: Install-Party
link: https://install-party.crans.org/
- text: Technical seminars
link: https://wiki.crans.org/CransTechnique/CransApprentis/SeminairesTechniques
# Disables warnings
disableKinds:
......@@ -81,14 +55,17 @@ outputs:
menu:
main:
- name: Séminaires
url: https://wiki.crans.org/CransTechnique/CransApprentis/SeminairesTechniques
weight: 5
- name: Intranet
url: https://intranet.crans.org/login/
weight: 50
params:
# Description and keywords for search engines
DefaultDescription: Le Crans est une association fournissant le réseau sur le campus du CROUS de Cachan
DefaultKeywords: ["crans", "crous", "réseau", "cachan", "association", "normal", "supérieur", "ens"]
DefaultDescription: Le Crans est une l'association réseau de l'ENS Paris-Saclay
DefaultKeywords: ["crans", "réseau", "association", "normal", "supérieur", "ens"]
# Logo (from static/images/logos/___)
navbarlogo:
......
content/_index.en.html deleted 100644 → 0
View file @ 736ea176
---
title: Home
---
<section class="hero is-fullheight is-bold">
<div class="hero-body">
<div class="container">
<div class="columns is-vcentered">
<div class="column is-5 is-offset-1 landing-caption">
<h1 class="title is-1 is-bold is-spaced">
Welcome to the Crans!
</h1>
<h2 class="subtitle is-5 is-muted">
The Crans is an organization run by student volunteers, which provides
high speed wired Internet and WiFi access to the residents of the CROUS de Cachan for 50€ annual fee.
</h2>
<p>
<a class="button is-medium is-rounded is-primary" href="{{< ref "register.en.md" >}}">
Suscribe 📝
</a>
</p>
</div>
<div class="column is-5 is-offset-1">
<figure class="image is-4by3">
<img src="/images/crans.svg" alt="Logo Crans">
</figure>
</div>
</div>
</div>
</div>
</section>
<!-- Services section -->
<section class="section">
<div class="container">
<div class="title-wrapper has-text-centered">
<h2 class="title is-2">Services</h2>
<h3 class="subtitle has-text-grey-lighter">that we offer to our members</h3>
<div class="divider is-centered"></div>
</div>
<div class="content-wrapper">
<div class="columns">
<div class="column is-one-third">
<div class="feature-card is-bordered has-text-centered">
<div class="card-title">
<h4>Wired Internet</h4>
</div>
<div class="card-icon">
<img src="/images/illustrations/icons/ethernet.svg">
</div>
<div class="card-text">
<p>from 100 to 1000Mb/s, one free Ethernet cable</p>
</div>
</div>
</div>
<div class="column is-one-third">
<div class="feature-card is-bordered has-text-centered">
<div class="card-title">
<h4>Wi-Fi coverage</h4>
</div>
<div class="card-icon">
<img src="/images/illustrations/icons/wifi.svg">
</div>
<div class="card-text">
<p>more than 15 Wi-Fi access points per building</p>
</div>
</div>
</div>
<div class="column is-one-third">
<div class="feature-card is-bordered has-text-centered">
<div class="card-title">
<h4>Web services</h4>
</div>
<div class="card-icon">
<img src="/images/illustrations/icons/services.svg">
</div>
<div class="card-text">
<p>30Go cloud storage, personnal web hosting...</p>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
<!-- Question section -->
<section class="section">
<div class="container">
<div class="title-wrapper has-text-centered">
<h2 class="title is-2">You have a question?</h2>
<h3 class="subtitle has-text-grey-lighter">Having issues ? Would you like to help us?</h3>
<div class="divider is-centered"></div>
</div>
<p class="has-text-centered" style="margin-top: 20px;">
<a class="button is-medium is-rounded is-info" href="{{< ref path="faq" lang="en" >}}">
Need help ?
</a>
<a class="button is-medium is-rounded is-success" href="#contact">
Contact us
</a>
</p>
</div>
</section>
content/_index.fr.html
View file @ 9f6da738
......@@ -6,25 +6,38 @@ title: Accueil
<div class="container">
<div class="columns is-vcentered">
<div class="column is-5 is-offset-1 landing-caption">
<h1 class="title is-1 is-bold is-spaced">
<h1 class="title is-spaced">
Bienvenue au Crans
</h1>
<h2 class="subtitle is-5 is-muted">
Le Crans est une association gérée par des bénévoles étudiants, qui fournit une couverture
internet filaire et WiFi très haut débit aux habitants du CROUS de Cachan pour 50€ par an.
<h2 class="subtitle">
Le Crans est l'association réseau de l'ENS Paris-Saclay, qui fournit
des services numériques et une couverture internet filaire aux
associations et clubs de l'ENS Paris-Saclay.
</h2>
<p>
<a class="button is-medium is-rounded is-primary" href="{{< ref "register.fr.md" >}}">
S'inscrire 📝
<a class="button is-medium is-rounded is-info" href="mailto:contact@crans.org">
Nous contacter ✉️
</a>
</p>
</div>
<div class="column is-5 is-offset-1">
<div class="column is-5">
<figure class="image is-4by3">
<img src="/images/crans.svg" alt="Logo Crans">
</figure>
</div>
</div>
<article class="message is-warning">
<div class="message-header is-size-5">
<p>Arrêt du service Internet sur le campus du CROUS de Cachan</p>
</div>
<div class="message-body is-size-5">
Le Crans arrête de fournir Internet au campus du CROUS de Cachan
depuis le 22 février 2022. Nous sommes remplacés par un prestataire
du CROUS. Nous vous invitons à vous connecter en Wi-Fi sur
<b>PlanetCampus</b> avec le code fourni par le CROUS.
</div>
</article>
</div>
</div>
</section>
......@@ -43,27 +56,21 @@ title: Accueil
<div class="column is-one-third">
<div class="feature-card is-bordered has-text-centered">
<div class="card-title">
<h4>Une connexion filaire</h4>
<h4>Une connexion filaire dans les locaux associatifs</h4>
</div>
<div class="card-icon">
<img src="/images/illustrations/icons/ethernet.svg">
</div>
<div class="card-text">
<p>d'un débit de 100 à 1000Mb/s, câble Ethernet offert</p>
</div>
</div>
</div>
<div class="column is-one-third">
<div class="feature-card is-bordered has-text-centered">
<div class="card-title">
<h4>Une couverture Wi-Fi</h4>
<h4>Hébergement de machines</h4>
</div>
<div class="card-icon">
<img src="/images/illustrations/icons/wifi.svg">
</div>
<div class="card-text">
<p>plus de 15 bornes Wi-Fi par bâtiment</p>
<img src="/images/illustrations/icons/machine.svg">
</div>
</div>
</div>
......@@ -74,10 +81,7 @@ title: Accueil
<h4>Des services Web</h4>
</div>
<div class="card-icon">
<img src="/images/illustrations/icons/services.svg">
</div>
<div class="card-text">
<p>Stockage cloud de 30Go, hébergement web...</p>
<a href="https://services.crans.org/"><img src="/images/illustrations/icons/services.svg"></a>
</div>
</div>
</div>
......@@ -85,22 +89,3 @@ title: Accueil
</div>
</div>
</section>
<!-- Question section -->
<section class="section">
<div class="container">
<div class="title-wrapper has-text-centered">
<h2 class="title is-2">Une question ?</h2>
<h3 class="subtitle has-text-grey-lighter">Un problème ? Envie de participer ?</h3>
<div class="divider is-centered"></div>
</div>
<p class="has-text-centered" style="margin-top: 20px;">
<a class="button is-medium is-rounded is-info" href="{{< ref "faq" >}}">
Besoin d'aide ?
</a>
<a class="button is-medium is-rounded is-success" href="#contact">
Nous contacter
</a>
</p>
</div>
</section>
content/about.en.md deleted 100644 → 0
View file @ 736ea176
---
title: About us
menu:
main:
weight: 1
---
**The Crans has the goal of ensuring that residents
of the CROUS de Cachan get a wired Internet connection and WiFi.**
Each accommodation is now wired, and WiFi coverage is almost
complete.
Although its main objective remains the management of the
campus in order to ensure Internet access for its 1300 members,
the Crans has developed many other activities.
Today the association also provides its members with services such as
a [lifetime mailbox](https://intranet.crans.org/users/mon_profil/#email),
[a hosting of personal pages](https://perso.crans.org/),
[television](https://tv.crans.org/)...
**The Crans also has an educational purpose** ;
we organize for example
[weekly technical seminars](https://wiki.crans.org/CransTechnique/CransApprentis/SeminairesTechniques)
on general or specific Crans themes,
such as network management and associated protocols and services.
The association also aims to promote at all times the use of the
free software to its members and the general public:
organizing events like [the install party](https://install-party.crans.org/)
annual meetings, which are also the occasion for conferences,
but also for example hosting a mirror of [VideoLAN](https://www.videolan.org/), [Debian](https://www.debian.org/) and [Ubuntu](https://ubuntu.com/).
The association is also a member of [APRIL](https://april.org/).
The Crans is a member of [FedeRez](https://www.federez.net/),
student union federation aimed at
coordinate exchanges between computer associations.
<article class="message is-info">
<div class="message-header is-size-5">
<p>I want to help!</p>
</div>
<div class="message-body is-size-5">
If you would like to get to know the other side of the coin, be it the administrative management of a large-scale association or the technical management of the infrastructure, you are very welcome. There is no particular knowledge to begin with, but if you join us, you will have the opportunity to acquire a lot of it. The easiest way to start is to get in touch with us, for example by meeting us at the Kfet during a shift. See you soon!
</div>
</article>
content/about.fr.md
View file @ 9f6da738
......@@ -5,18 +5,14 @@ menu:
weight: 1
---
**Le Crans s'est fixé pour but d'assurer aux résidents de la
résidence du CROUS de Cachan une connection Internet filaire et WiFi.**
Chaque logement est aujourd'hui câblé, et la couverture WiFi est presque
complète.
**Le Crans est l'association réseau de l'ENS Paris-Saclay**,
nous fournissons des services numériques aux usagé·ère·s de l'ENS Paris-Saclay,
ainsi qu'une couverture internet filaire aux associations
et clubs de l'ENS Paris-Saclay.
Bien que son principal objectif reste la gestion du réseau informatique du
campus afin d'assurer à ses **1300 adhérents** un accès Internet,
le Crans a développé de nombreuses autres activités.
Aujourd'hui l'association fournit également à ses adhérents des services tels
qu'[une boîte mail à vie](https://intranet.crans.org/users/mon_profil/#email),
[un hébergement de pages personnelles](https://perso.crans.org/),
[la télévision](https://tv.crans.org/)...
Aujourd'hui l'association fournit des services tels
qu'[une boîte mail à vie](https://intranet.crans.org/users/mon_profil/#email)
ou [un hébergement de pages personnelles](https://perso.crans.org/).
**Le Crans a également un but pédagogique** ;
nous organisons par exemple
......@@ -24,7 +20,7 @@ nous organisons par exemple
sur des thèmes généraux ou spécifiques au Crans,
comme la gestion d'un réseau et les protocoles et services associés.
L'association a aussi pour but de promouvoir en toute occasion l'utilisation
L'association a aussi pour but de promouvoir l'utilisation
des logiciels libres auprès de ses adhérents comme auprès du grand public :
organisation d'événements comme [les install party](https://install-party.crans.org/)
annuelles, qui sont également l'occasion de conférences,
......@@ -40,11 +36,11 @@ coordonner les échanges entre associations d'informatique.
</div>
<div class="message-body is-size-5">
Si tu as envie de découvrir l'envers du décor, que ce soit la gestion
administrative d'une association à grande échelle ou la gestion technique
de l'infrastructure, tu es le/la bienvenu(e). Il n'y a pas de connaissance
administrative d'une association ou la gestion technique
de l'infrastructure, tu es le/la bienvenu·e. Il n'y a pas de connaissance
particulière à avoir pour commencer, mais si tu nous rejoins, tu auras
l'occasion d'en acquérir de nombreuses. Pour commencer, le plus simple est
de prendre contact avec nous, par exemple en nous croisant à la Kfet pendant
une permanence. À bientôt !
de prendre contact avec nous, par exemple en nous croisant à la Kfet.
À bientôt !
</div>
</article>
content/connection.en.md deleted 100644 → 0
View file @ 736ea176
---
title: Connection to the network
menu:
main:
weight: 3
toc: true
---
The WiFi network at the Crans is protected by `WPA2-Enterprise` authentication
and the wired network is protected by an authentication by captive portal.
In both cases the connection requires a login and a password.
No manipulation on the intranet is required to add
a new machine: at the first connection
**your device will be automatically registered on your intranet account**.
<article class="message is-info">
<div class="message-header is-size-5">
<p>Username and password</p>
</div>
<div class="message-body is-size-5">
The username and password needed to connect to the network
are the same as for connecting to
the <a href="https://intranet.crans.org/">intranet</a>.
</div>
</article>
<article class="message is-warning">
<div class="message-header is-size-5">
<p>Do not log in with an account other than yours!</p>
</div>
<div class="message-body is-size-5">
The machine MUST NOT be already registered on another account!
If you lend your identifiers, then this other person will
no longer be able to register his machine on the network.
If this is the case you need to contact us.
</div>
</article>
<div class="divider"></div>
## WiFi on Windows 8, 8.1, et 10
Select the WiFi network `Cr@ns`, and enter your login and password directly.
You should have internet access in less than 10 minutes.
If you have a security alert regarding our certificates,
ignore it the first time you connect and validate the certificate.
If you wish to have slightly more speed but less distance,
you can log on to `Cr@ns-5g`.
<div class="divider"></div>
## WiFi on Windows XP, Vista ou 7
<article class="message is-warning">
<div class="message-header is-size-5">
<p>Windows 7 support has expired!</p>
</div>
<div class="message-body is-size-5">
Microsoft has decided to no longer distribute security updates
for Windows 7 since January 14, 2020.
We strongly encourage you to upgrade to Windows 10 or Linux
which in both cases is free.
</div>
</article>
We no longer support theses operating systems because
they are no longer secure and cause security problems for the network.
<div class="divider"></div>
## WiFi on MacOS
<article class="message is-info">
<div class="message-header is-size-5">
<p>Instability on 2.4 GHz network</p>
</div>
<div class="message-body is-size-5">
On updated Apple machines, a bug in the implementation of 2.4 GHz WiFi
makes the connection unstable on the `Cr@ns` network. To counteract this, you
can connect in 5 GHz to the `Cr@ns-5g` network.
</div>
</article>
Select the WiFi network `Cr@ns-5g` or `Cr@ns`
and enter your login and password directly.
You should have internet access in less than 10 minutes.
{{< figure src="/images/content/wifi-macos.png" title="" >}}
<div class="divider"></div>
## WiFi on Android
Select the WiFi network `Cr@ns-5g` or `Cr@ns`.
Please choose:
* EAP method: `PEAP`,
* Authentication step 2: `MSCHAPV2`,
* Enter your login and password directly.
You should have internet access in less than 10 minutes.
{{< figure src="/images/content/wifi-android.jpg" title="" >}}
<div class="divider"></div>
## WiFi on iOS
<article class="message is-info">
<div class="message-header is-size-5">
<p>Instability on 2.4 GHz network</p>
</div>
<div class="message-body is-size-5">
On updated Apple machines, a bug in the implementation of 2.4 GHz WiFi
makes the connection unstable on the `Cr@ns` network. To counteract this, you
can connect in 5 GHz to the `Cr@ns-5g` network.
</div>
</article>
Select the WiFi network `Cr@ns-5g` or `Cr@ns`
and enter your login and password directly.
You should have internet access in less than 10 minutes.
At the first connection the device asks you to rely on our certificate.
{{< figure src="/images/content/wifi-ios.jpg" title="" >}}
<div class="divider"></div>
## WiFi on Linux
The vast majority of Linux distributions (Ubuntu, Debian, Fedora...)
use the NetworkManager tool to manage the WiFi connection.
Select the wifi network `Cr@ns` or `Cr@ns-5g` then :
* Authentication: `Secure EAP (PEAP)`,
* Phase 2 authentication: `MSCHAPV2`,
* Check the box `No CA certificate required`, unless you want to download
every 3 months our certificate,
* Enter your login and password directly.
You should have internet access in less than 10 minutes.
{{< figure src="/images/content/wifi-linux.jpg" title="" >}}
<div class="divider"></div>
## WiFi on other devices
For game consoles, the vast majority (Xbox, Playstation, Nintendo
Switch...) do not support `WPA2-Enterprise'.
If you wish to connect this device, then you must either go through
the Ethernet cable, or buy a WiFi router that you plug into the Ethernet port
of your room to have your own WiFi network.
The advantage of a router is to create your own private network, isolating your
other users' home devices.
<div class="divider"></div>
## Wired network
Each room has an "RJ45" Ethernet port.
If we do not have a cable to connect your computer,
one free cable will be given to you, when you first joined.
You can also purchase a USB/USB-C to Ethernet adapter at any time.
Connect directly by cable, in your room for example.
A pop-up window should open. If it doesn't, go to
<http://intranet.crans.org/>.
Then identify yourself with your username and password
and follow the instructions.
You should have internet access in less than 10 minutes.
You should also receive an email notification.
<article class="message is-info">
<div class="message-header is-size-5">
<p>No web browser?</p>
</div>
<div class="message-body is-size-5">
If you have a machine that can't surf the internet
(e.g. a WiFi router), then you will need to manually create your
wired machine.
Get the MAC address of your machine, then log in to
<a href="https://intranet.crans.org">the intranet</a>.
Then click on create a machine, fill in the MAC and let the
other parameters unchanged. Finally, connect the device to your outlet.
</div>
</article>
content/connection.fr.md deleted 100644 → 0
View file @ 736ea176
---
title: Connexion au réseau
menu:
main:
weight: 3
toc: true
---
Le WiFi au Crans est protégé par une authentification `WPA2-Entreprise`
et la connexion filaire est protégée par une authentification par
portail captif.
Dans les deux cas la connexion requiert un identifiant et un mot de passe.
Aucune manipulation sur l'intranet n'est nécessaire pour ajouter
une nouvelle machine : à la première connexion,
**votre appareil sera enregistré automatiquement sur votre compte intranet**.
<article class="message is-info">
<div class="message-header is-size-5">
<p>Identifiant et mot de passe</p>
</div>
<div class="message-body is-size-5">
L'identifiant et le mot de passe nécessaires à la connexion au réseau
sont les mêmes que pour vous connecter à
l'<a href="https://intranet.crans.org/">intranet</a>.
</div>
</article>
<article class="message is-warning">
<div class="message-header is-size-5">
<p>Ne vous connectez pas avec un autre compte que le vôtre !</p>
</div>
<div class="message-body is-size-5">
La machine NE DOIT PAS être déjà enregistrée sur un autre compte !
Si vous prêtez vos identifiants, alors cette autre personne ne pourra
plus inscrire sa machine sur le réseau.
Si c'est le cas vous devez nous contacter.
</div>
</article>
<div class="divider"></div>
## WiFi sur Windows 8, 8.1, et 10
Sélectionnez le réseau WiFi `Cr@ns`, et entrez directement vos identifiants.
Vous devriez bénéficier d'un accès internet en moins de 10 minutes.
Si vous avez une alerte de sécurité concernant nos certificats,
ignorez la à la première connexion et validez le certificat.
Si vous souhaitez avoir légèrement plus de vitesse mais moins de distance,
vous pouvez vous connecter sur `Cr@ns-5g`.
<div class="divider"></div>
## WiFi sur Windows XP, Vista ou 7
<article class="message is-warning">
<div class="message-header is-size-5">
<p>Le support de Windows 7 a expiré !</p>