aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-08 15:20:06 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-08 15:20:06 +0100
commit527e32add1513cc35fecfc340943407e799026ca (patch)
treebf0005c12b584d3d7a86cf91e029f737b971c486
parentd252d718e9d42fb3a13d64e5b8daa37ca9264211 (diff)
downloadNix-527e32add1513cc35fecfc340943407e799026ca.tar.gz
Nix-527e32add1513cc35fecfc340943407e799026ca.tar.zst
Nix-527e32add1513cc35fecfc340943407e799026ca.zip
Add connexionswing production
-rw-r--r--virtual/eldiron.nix38
-rw-r--r--virtual/packages/connexionswing.nix3
-rw-r--r--virtual/packages/connexionswing_goaccess.conf99
-rw-r--r--virtual/packages/connexionswing_master.json6
4 files changed, 129 insertions, 17 deletions
diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 172b369..62b8364 100644
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -175,20 +175,20 @@
175 "www.osteopathe-cc.fr" = null; 175 "www.osteopathe-cc.fr" = null;
176 }; 176 };
177 }; 177 };
178 # "connexionswing" = { 178 "connexionswing" = {
179 # webroot = "/var/lib/acme/acme-challenge"; 179 webroot = "/var/lib/acme/acme-challenge";
180 # email = "ismael@bouya.org"; 180 email = "ismael@bouya.org";
181 # domain = "connexionswing.com"; 181 domain = "connexionswing.com";
182 # plugins = [ "cert.pem" "chain.pem" "fullchain.pem" "full.pem" "key.pem" "account_key.json" ]; 182 plugins = [ "cert.pem" "chain.pem" "fullchain.pem" "full.pem" "key.pem" "account_key.json" ];
183 # postRun = '' 183 postRun = ''
184 # systemctl reload httpd.service 184 systemctl reload httpd.service
185 # ''; 185 '';
186 # extraDomains = { 186 extraDomains = {
187 # "www.connexionswing.com" = null; 187 "www.connexionswing.com" = null;
188 # "sandetludo.com" = null; 188 "sandetludo.com" = null;
189 # "www.sandetludo.com" = null; 189 "www.sandetludo.com" = null;
190 # }; 190 };
191 # }; 191 };
192 }; 192 };
193 193
194 services.openssh.extraConfig = '' 194 services.openssh.extraConfig = ''
@@ -315,6 +315,7 @@
315 mkdir -p /var/lib/goaccess/ludivinecassal.com 315 mkdir -p /var/lib/goaccess/ludivinecassal.com
316 mkdir -p /var/lib/goaccess/piedsjaloux.fr 316 mkdir -p /var/lib/goaccess/piedsjaloux.fr
317 mkdir -p /var/lib/goaccess/osteopathe-cc.fr 317 mkdir -p /var/lib/goaccess/osteopathe-cc.fr
318 mkdir -p /var/lib/goaccess/connexionswing.com
318 ''; 319 '';
319 }; 320 };
320 321
@@ -472,6 +473,14 @@
472 mypkgs.connexionswing_dev.apache.vhostConf 473 mypkgs.connexionswing_dev.apache.vhostConf
473 ]; 474 ];
474 }) 475 })
476 (withConf "connexionswing" // {
477 hostName = "connexionswing.com";
478 serverAliases = [ "sandetludo.com" "www.connexionswing.com" "www.sandetludo.com" ];
479 documentRoot = mypkgs.connexionswing_prod.webRoot;
480 extraConfig = builtins.concatStringsSep "\n" [
481 mypkgs.connexionswing_prod.apache.vhostConf
482 ];
483 })
475 (withConf "eldiron" // { 484 (withConf "eldiron" // {
476 hostName = "ludivine.immae.eu"; 485 hostName = "ludivine.immae.eu";
477 documentRoot = mypkgs.ludivinecassal_dev.webRoot; 486 documentRoot = mypkgs.ludivinecassal_dev.webRoot;
@@ -659,6 +668,7 @@
659 "5 0 * * * root ${stats "ludivinecassal.com" ./packages/ludivinecassal_goaccess.conf}" 668 "5 0 * * * root ${stats "ludivinecassal.com" ./packages/ludivinecassal_goaccess.conf}"
660 "5 0 * * * root ${stats "piedsjaloux.fr" ./packages/piedsjaloux_goaccess.conf}" 669 "5 0 * * * root ${stats "piedsjaloux.fr" ./packages/piedsjaloux_goaccess.conf}"
661 "5 0 * * * root ${stats "osteopathe-cc.fr" ./packages/chloe_goaccess.conf}" 670 "5 0 * * * root ${stats "osteopathe-cc.fr" ./packages/chloe_goaccess.conf}"
671 "5 0 * * * root ${stats "connexionswing.com" ./packages/connexionswing_goaccess.conf}"
662 ]; 672 ];
663 }; 673 };
664 674
diff --git a/virtual/packages/connexionswing.nix b/virtual/packages/connexionswing.nix
index 199c893..1f3f2d5 100644
--- a/virtual/packages/connexionswing.nix
+++ b/virtual/packages/connexionswing.nix
@@ -121,6 +121,8 @@ let
121 121
122 </Directory> 122 </Directory>
123 '' else '' 123 '' else ''
124 Use Stats connexionswing.com
125
124 <Directory ${webRoot}> 126 <Directory ${webRoot}>
125 Options Indexes FollowSymLinks MultiViews Includes 127 Options Indexes FollowSymLinks MultiViews Includes
126 AllowOverride All 128 AllowOverride All
@@ -158,6 +160,7 @@ let
158 160
159 ln -sf ../../../../../${varDir}/{medias,uploads} web/images/ 161 ln -sf ../../../../../${varDir}/{medias,uploads} web/images/
160 ln -sf ${configRoot} app/config/parameters.yml 162 ln -sf ${configRoot} app/config/parameters.yml
163 sed -i -e "/Incenteev..ParameterHandler..ScriptHandler::buildParameters/d" composer.json
161 ${if environment == "dev" then "php bin/composer install" else '' 164 ${if environment == "dev" then "php bin/composer install" else ''
162 SYMFONY_ENV=prod php bin/composer install --no-dev 165 SYMFONY_ENV=prod php bin/composer install --no-dev
163 ./bin/console assetic:dump --env=prod --no-debug 166 ./bin/console assetic:dump --env=prod --no-debug
diff --git a/virtual/packages/connexionswing_goaccess.conf b/virtual/packages/connexionswing_goaccess.conf
new file mode 100644
index 0000000..05ad083
--- /dev/null
+++ b/virtual/packages/connexionswing_goaccess.conf
@@ -0,0 +1,99 @@
1time-format %H:%M:%S
2date-format %d/%b/%Y
3
4#sur immae.eu
5#log-format %v %h %^[%d:%t %^] "%r" %s %b "%R" "%u" $^
6
7log-format VCOMBINED
8#= %v:%^ %h %^[%d:%t %^] "%r" %s %b "%R" "%u"
9
10html-prefs {"theme":"bright","layout":"vertical"}
11
12exclude-ip 188.165.209.148
13exclude-ip 178.33.252.96
14exclude-ip 2001:41d0:2:9c94::1
15exclude-ip 2001:41d0:2:9c94::
16exclude-ip 176.9.151.89
17exclude-ip 2a01:4f8:160:3445::
18exclude-ip 82.255.56.72
19
20no-query-string true
21
22keep-db-files true
23load-from-disk true
24db-path /var/lib/goaccess/connexionswing.com
25
26ignore-panel REFERRERS
27ignore-panel KEYPHRASES
28
29static-file .css
30static-file .js
31static-file .jpg
32static-file .png
33static-file .gif
34static-file .ico
35static-file .jpeg
36static-file .pdf
37static-file .csv
38static-file .mpeg
39static-file .mpg
40static-file .swf
41static-file .woff
42static-file .woff2
43static-file .xls
44static-file .xlsx
45static-file .doc
46static-file .docx
47static-file .ppt
48static-file .pptx
49static-file .txt
50static-file .zip
51static-file .ogg
52static-file .mp3
53static-file .mp4
54static-file .exe
55static-file .iso
56static-file .gz
57static-file .rar
58static-file .svg
59static-file .bmp
60static-file .tar
61static-file .tgz
62static-file .tiff
63static-file .tif
64static-file .ttf
65static-file .flv
66#static-file .less
67#static-file .ac3
68#static-file .avi
69#static-file .bz2
70#static-file .class
71#static-file .cue
72#static-file .dae
73#static-file .dat
74#static-file .dts
75#static-file .ejs
76#static-file .eot
77#static-file .eps
78#static-file .img
79#static-file .jar
80#static-file .map
81#static-file .mid
82#static-file .midi
83#static-file .ogv
84#static-file .webm
85#static-file .mkv
86#static-file .odp
87#static-file .ods
88#static-file .odt
89#static-file .otf
90#static-file .pict
91#static-file .pls
92#static-file .ps
93#static-file .qt
94#static-file .rm
95#static-file .svgz
96#static-file .wav
97#static-file .webp
98
99
diff --git a/virtual/packages/connexionswing_master.json b/virtual/packages/connexionswing_master.json
index 30c0c96..2e1775b 100644
--- a/virtual/packages/connexionswing_master.json
+++ b/virtual/packages/connexionswing_master.json
@@ -1,5 +1,5 @@
1{ 1{
2 "tag": "0c9458f-master", 2 "tag": "0330478-master",
3 "meta": { 3 "meta": {
4 "name": "connexionswing_master", 4 "name": "connexionswing_master",
5 "url": "gitolite@git.immae.eu:perso/Immae/Projets/Connexionswing", 5 "url": "gitolite@git.immae.eu:perso/Immae/Projets/Connexionswing",
@@ -7,8 +7,8 @@
7 }, 7 },
8 "git": { 8 "git": {
9 "url": "gitolite@git.immae.eu:perso/Immae/Projets/Connexionswing", 9 "url": "gitolite@git.immae.eu:perso/Immae/Projets/Connexionswing",
10 "rev": "0c9458fadbda05e1ffc54956162ee92ad4dd6aef", 10 "rev": "0330478cd256e6e36f525d3d0a247bad06de319f",
11 "sha256": "04blmpfpb6j57m032vpddcn1775bwx537zvv7fi25ip2yg507fjv", 11 "sha256": "1sh97965winvbmpzqhjidhqry9840fa701wvr4vxywccyg4dyr17",
12 "fetchSubmodules": true 12 "fetchSubmodules": true
13 } 13 }
14} 14}