Skip to content

Commit 9306a95

Browse files
NodraakNodraak
committed
Update deploy.sh + maintenance
1 parent d100163 commit 9306a95

File tree

5 files changed

+124
-9
lines changed

5 files changed

+124
-9
lines changed

‎prod/deploy.sh‎

100644100755
Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ fi
1515
cd /opt/iteam-env/iteam-site/
1616

1717
# Maintenance mode
18-
sudo rm /etc/nginx/sites-enabled/iteam
19-
sudo ln -s /etc/nginx/sites-available/iteam-maintenance /etc/nginx/sites-enabled/iteam-maintenance
20-
sudo service nginx reload
18+
#sudo rm /etc/nginx/sites-enabled/iteam
19+
#sudo ln -s /etc/nginx/sites-available/iteam-maintenance /etc/nginx/sites-enabled/iteam-maintenance
20+
#sudo service nginx reload
2121

2222
# Delete old branch if exists
2323
git checkout prod
@@ -31,6 +31,10 @@ git checkout $1
3131
# Create a branch with the same name - required to have version data in footer
3232
git checkout -b $1
3333

34+
# compute front stuff
35+
compass compile assets/
36+
python manage.py collectstatic --noinput
37+
3438
# Update application data
3539
source ../bin/activate
3640
pip install --upgrade -r requirements.txt
@@ -41,9 +45,9 @@ deactivate
4145
sudo supervisorctl restart iteam
4246

4347
# Exit maintenance mode
44-
sudo rm /etc/nginx/sites-enabled/iteam-maintenance
45-
sudo ln -s /etc/nginx/sites-available/iteam /etc/nginx/sites-enabled/iteam
46-
sudo service nginx reload
48+
#sudo rm /etc/nginx/sites-enabled/iteam-maintenance
49+
#sudo ln -s /etc/nginx/sites-available/iteam /etc/nginx/sites-enabled/iteam
50+
#sudo service nginx reload
4751

4852
# Display current branch and commit
4953
git status

‎prod/gunicorn_start.sh‎

100644100755
File mode changed.

‎prod/nginx-maintenance.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ server {
3737
location / {
3838
client_max_body_size 100M;
3939

40-
return 503 //opt/iteam-env/iteam-site/templates/maintenance.html;
40+
return 503 /opt/iteam-env/iteam-site/templates/maintenance.html;
4141
}
4242

4343

4444
# Error pages
4545

4646
error_page 500 501 502 503 504 /500.html;
4747
location = /500.html {
48-
root //opt/iteam-env/iteam-site/templates/;
48+
root /opt/iteam-env/iteam-site/templates/;
4949
}
5050
}
5151

‎templates/500.html‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
2+
3+
<!DOCTYPE html>
4+
<html lang="fr" class="no-js">
5+
<head>
6+
<meta charset="utf-8" />
7+
8+
<title>Erreur 500 &#183; iTeam.org</title>
9+
10+
<meta name="language" content="fr">
11+
<meta http-equiv="content-language" content="fr">
12+
<meta name="viewport" content="width=device-width, initial-scale=1" />
13+
<meta name="description" content="iTeam.org est le site d'une association de l'ECE pour la promotion du logiciel libre et de l'open source : par exemple le navigateur Firefox, la suite OpenOffice ou le système Linux.">
14+
15+
<link href="/static/stylesheets/app.css" media="all" rel="stylesheet" type="text/css" />
16+
17+
<script src="/static/javascripts/vendor/custom.modernizr.js"></script>
18+
19+
<link rel="shortcut icon" type="image/png" href="/static/images/favicon.ico" />
20+
21+
</head>
22+
23+
<!--
24+
25+
#################################################################
26+
# #
27+
# ##### ##### ##### ### # # ### #### #### #
28+
# # # # # # ## ## # # # # # #
29+
# # # #### ##### # ## # # # #### # ## #
30+
# # # # # # # # # # # # # # #
31+
# ##### # ##### # # # # # ### # # ### #
32+
# #
33+
#################################################################
34+
35+
FYI : You just lost the Game ! <3
36+
37+
-->
38+
39+
<body>
40+
<div id="h"></div>
41+
42+
<!--[if lt IE 8]>
43+
<div class="browsehappy">
44+
Vous utilisez un navigateur dépassé. Merci de
45+
<a href="http://browsehappy.com/">mettre à jour celui-ci</a> pour
46+
améliorer votre expérience.
47+
</div>
48+
<![endif]-->
49+
50+
<div class="warning_js">
51+
Votre javascript semble désactivé. Ce site l'utilise avec parcimonie et
52+
nous vous conseillons de le réactiver.
53+
</div>
54+
55+
56+
<nav class="top-bar" data-topbar>
57+
<ul class="title-area">
58+
<li class="name">
59+
<a href="/">
60+
<span>
61+
<img src="/static/images/logo_light.png" alt="logo_light" />
62+
</span>
63+
</a>
64+
</li>
65+
</ul>
66+
</nav>
67+
68+
69+
<div class="row">
70+
<div class="large-12 columns">
71+
<h2>
72+
Erreur 500
73+
</h2>
74+
<p>
75+
Le serveur n'a pas répondu a la requête, merci de réessayer dans quelques instants.
76+
</p>
77+
</div>
78+
</div>
79+
80+
81+
<hr />
82+
<footer class="row">
83+
<div class="large-6 columns">
84+
<p>
85+
iTeam 2014 - <a href="https://github.com/Nodraak/iteam-site">Open source</a>
86+
</p>
87+
</div>
88+
<div class="large-6 columns hide-for-medium hide-for-large hide-for-xlarge hide-for-xxlarge">
89+
<ul class="inline-list left">
90+
<li><a href="/pages/apropos/">À propos</a></li>
91+
<li><a href="http://irc.iteam.org">IRC</a></li>
92+
<li><a href="http://ece.fr">ECE</a></li>
93+
<li><a href="/pages/">Plus</a></li>
94+
<li><a href="#h">↑</a></li>
95+
96+
</ul>
97+
</div>
98+
<div class="large-6 columns hide-for-small">
99+
<ul class="inline-list right">
100+
<li><a href="/pages/apropos/">À propos</a></li>
101+
<li><a href="http://irc.iteam.org">IRC</a></li>
102+
<li><a href="http://ece.fr">ECE</a></li>
103+
<li><a href="/pages/">Plus</a></li>
104+
<li><a href="#h">↑</a></li>
105+
106+
</ul>
107+
</div>
108+
</footer>
109+
110+
</body>
111+
</html>

‎templates/maintenance.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ <h2>
7272
Maintenance en cours ...
7373
</h2>
7474
<p>
75-
Le site est actuellement en cours de maintenance et devrait repasser en ligne dans quelques minutes.@
75+
Le site est actuellement en cours de maintenance et devrait repasser en ligne dans quelques minutes.
7676
</p>
7777
</div>
7878
</div>

0 commit comments

Comments
 (0)