aboutsummaryrefslogtreecommitdiff
path: root/nixops
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-11 02:19:10 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-11 02:28:20 +0200
commitb7ee93fcdee2509cd4c0caec2c5c59ccff5bab2c (patch)
tree231d151cbf4f5d51e6ddac11a4355cacddc4b847 /nixops
parentf826c67c0ff51c9724e8f54da6c9cbef78977858 (diff)
downloadNix-b7ee93fcdee2509cd4c0caec2c5c59ccff5bab2c.tar.gz
Nix-b7ee93fcdee2509cd4c0caec2c5c59ccff5bab2c.tar.zst
Nix-b7ee93fcdee2509cd4c0caec2c5c59ccff5bab2c.zip
Make goaccess a template
Diffstat (limited to 'nixops')
-rw-r--r--nixops/modules/websites/aten/default.nix5
-rw-r--r--nixops/modules/websites/chloe/default.nix5
-rw-r--r--nixops/modules/websites/chloe/goaccess.conf99
-rw-r--r--nixops/modules/websites/commons/goaccess.conf (renamed from nixops/modules/websites/aten/goaccess.conf)2
-rw-r--r--nixops/modules/websites/commons/stats.nix12
-rw-r--r--nixops/modules/websites/connexionswing/default.nix5
-rw-r--r--nixops/modules/websites/connexionswing/goaccess.conf99
-rw-r--r--nixops/modules/websites/ftp/denisejerome.nix5
-rw-r--r--nixops/modules/websites/ftp/denisejerome_goaccess.conf99
-rw-r--r--nixops/modules/websites/ftp/immae.nix5
-rw-r--r--nixops/modules/websites/ftp/immae_goaccess.conf99
-rw-r--r--nixops/modules/websites/ftp/jerome.nix5
-rw-r--r--nixops/modules/websites/ftp/jerome_goaccess.conf99
-rw-r--r--nixops/modules/websites/ftp/leila.nix12
-rw-r--r--nixops/modules/websites/ftp/leila_chorale_goaccess.conf99
-rw-r--r--nixops/modules/websites/ftp/leila_goaccess.conf99
-rw-r--r--nixops/modules/websites/ftp/nassime.nix5
-rw-r--r--nixops/modules/websites/ftp/nassime_goaccess.conf99
-rw-r--r--nixops/modules/websites/ftp/release.nix5
-rw-r--r--nixops/modules/websites/ftp/release_goaccess.conf99
-rw-r--r--nixops/modules/websites/ludivine/default.nix5
-rw-r--r--nixops/modules/websites/ludivine/goaccess.conf99
-rw-r--r--nixops/modules/websites/piedsjaloux/default.nix5
-rw-r--r--nixops/modules/websites/piedsjaloux/goaccess.conf99
24 files changed, 24 insertions, 1141 deletions
diff --git a/nixops/modules/websites/aten/default.nix b/nixops/modules/websites/aten/default.nix
index f6efe01..5dff008 100644
--- a/nixops/modules/websites/aten/default.nix
+++ b/nixops/modules/websites/aten/default.nix
@@ -28,10 +28,7 @@ in {
28 secrets.keys = aten_prod.keys; 28 secrets.keys = aten_prod.keys;
29 services.myWebsites.commons.stats.enable = true; 29 services.myWebsites.commons.stats.enable = true;
30 services.myWebsites.commons.stats.sites = [ 30 services.myWebsites.commons.stats.sites = [
31 { 31 { name = "aten.pro"; }
32 name = "aten.pro";
33 conf = ./goaccess.conf;
34 }
35 ]; 32 ];
36 33
37 security.acme.certs."aten" = config.services.myCertificates.certConfig // { 34 security.acme.certs."aten" = config.services.myCertificates.certConfig // {
diff --git a/nixops/modules/websites/chloe/default.nix b/nixops/modules/websites/chloe/default.nix
index 0ea9213..8980077 100644
--- a/nixops/modules/websites/chloe/default.nix
+++ b/nixops/modules/websites/chloe/default.nix
@@ -28,10 +28,7 @@ in {
28 secrets.keys = chloe_prod.keys; 28 secrets.keys = chloe_prod.keys;
29 services.myWebsites.commons.stats.enable = true; 29 services.myWebsites.commons.stats.enable = true;
30 services.myWebsites.commons.stats.sites = [ 30 services.myWebsites.commons.stats.sites = [
31 { 31 { name = "osteopathe-cc.fr"; }
32 name = "osteopathe-cc.fr";
33 conf = ./goaccess.conf;
34 }
35 ]; 32 ];
36 33
37 security.acme.certs."chloe" = config.services.myCertificates.certConfig // { 34 security.acme.certs."chloe" = config.services.myCertificates.certConfig // {
diff --git a/nixops/modules/websites/chloe/goaccess.conf b/nixops/modules/websites/chloe/goaccess.conf
deleted file mode 100644
index 89cff6d..0000000
--- a/nixops/modules/websites/chloe/goaccess.conf
+++ /dev/null
@@ -1,99 +0,0 @@
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/osteopathe-cc.fr
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/nixops/modules/websites/aten/goaccess.conf b/nixops/modules/websites/commons/goaccess.conf
index 07cce57..4918988 100644
--- a/nixops/modules/websites/aten/goaccess.conf
+++ b/nixops/modules/websites/commons/goaccess.conf
@@ -21,7 +21,7 @@ no-query-string true
21 21
22keep-db-files true 22keep-db-files true
23load-from-disk true 23load-from-disk true
24db-path /var/lib/goaccess/aten.pro 24db-path @dbPath@
25 25
26ignore-panel REFERRERS 26ignore-panel REFERRERS
27ignore-panel KEYPHRASES 27ignore-panel KEYPHRASES
diff --git a/nixops/modules/websites/commons/stats.nix b/nixops/modules/websites/commons/stats.nix
index 88559b1..73595f1 100644
--- a/nixops/modules/websites/commons/stats.nix
+++ b/nixops/modules/websites/commons/stats.nix
@@ -8,7 +8,10 @@ in {
8 sites = lib.mkOption { 8 sites = lib.mkOption {
9 type = lib.types.listOf (lib.types.submodule { 9 type = lib.types.listOf (lib.types.submodule {
10 options = { 10 options = {
11 conf = lib.mkOption { type = lib.types.path; }; 11 conf = lib.mkOption {
12 type = lib.types.nullOr lib.types.path;
13 default = null;
14 };
12 name = lib.mkOption { type = lib.types.string; }; 15 name = lib.mkOption { type = lib.types.string; };
13 }; 16 };
14 }); 17 });
@@ -27,6 +30,11 @@ in {
27 enable = true; 30 enable = true;
28 systemCronJobs = let 31 systemCronJobs = let
29 stats = domain: conf: let 32 stats = domain: conf: let
33 config = if builtins.isNull conf
34 then pkgs.runCommand "goaccess.conf" {
35 dbPath = "/var/lib/goaccess/${domain}";
36 } "substituteAll ${./goaccess.conf} $out"
37 else conf;
30 d = pkgs.writeScriptBin "stats-${domain}" '' 38 d = pkgs.writeScriptBin "stats-${domain}" ''
31 #!${pkgs.stdenv.shell} 39 #!${pkgs.stdenv.shell}
32 set -e 40 set -e
@@ -39,7 +47,7 @@ in {
39 for i in /var/log/httpd/access_log-${domain}*.gz; do 47 for i in /var/log/httpd/access_log-${domain}*.gz; do
40 zcat "$i" | sed -n "/\\[$date_regex/ p" >> $TMPFILE 48 zcat "$i" | sed -n "/\\[$date_regex/ p" >> $TMPFILE
41 done 49 done
42 ${pkgs.goaccess}/bin/goaccess $TMPFILE --no-progress -o /var/lib/goaccess/${domain}/index.html -p ${conf} 50 ${pkgs.goaccess}/bin/goaccess $TMPFILE --no-progress -o /var/lib/goaccess/${domain}/index.html -p ${config}
43 ''; 51 '';
44 in "${d}/bin/stats-${domain}"; 52 in "${d}/bin/stats-${domain}";
45 allStats = sites: pkgs.writeScript "stats" '' 53 allStats = sites: pkgs.writeScript "stats" ''
diff --git a/nixops/modules/websites/connexionswing/default.nix b/nixops/modules/websites/connexionswing/default.nix
index 2966cb8..37426dd 100644
--- a/nixops/modules/websites/connexionswing/default.nix
+++ b/nixops/modules/websites/connexionswing/default.nix
@@ -28,10 +28,7 @@ in {
28 secrets.keys = connexionswing_prod.keys; 28 secrets.keys = connexionswing_prod.keys;
29 services.myWebsites.commons.stats.enable = true; 29 services.myWebsites.commons.stats.enable = true;
30 services.myWebsites.commons.stats.sites = [ 30 services.myWebsites.commons.stats.sites = [
31 { 31 { name = "connexionswing.com"; }
32 name = "connexionswing.com";
33 conf = ./goaccess.conf;
34 }
35 ]; 32 ];
36 33
37 security.acme.certs."connexionswing" = config.services.myCertificates.certConfig // { 34 security.acme.certs."connexionswing" = config.services.myCertificates.certConfig // {
diff --git a/nixops/modules/websites/connexionswing/goaccess.conf b/nixops/modules/websites/connexionswing/goaccess.conf
deleted file mode 100644
index 05ad083..0000000
--- a/nixops/modules/websites/connexionswing/goaccess.conf
+++ /dev/null
@@ -1,99 +0,0 @@
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/nixops/modules/websites/ftp/denisejerome.nix b/nixops/modules/websites/ftp/denisejerome.nix
index 2958d87..f39e5c2 100644
--- a/nixops/modules/websites/ftp/denisejerome.nix
+++ b/nixops/modules/websites/ftp/denisejerome.nix
@@ -17,10 +17,7 @@ in {
17 config = lib.mkIf cfg.production.enable { 17 config = lib.mkIf cfg.production.enable {
18 services.myWebsites.commons.stats.enable = true; 18 services.myWebsites.commons.stats.enable = true;
19 services.myWebsites.commons.stats.sites = [ 19 services.myWebsites.commons.stats.sites = [
20 { 20 { name = "denisejerome.piedsjaloux.fr"; }
21 name = "denisejerome.piedsjaloux.fr";
22 conf = ./denisejerome_goaccess.conf;
23 }
24 ]; 21 ];
25 22
26 security.acme.certs."denisejerome" = config.services.myCertificates.certConfig // { 23 security.acme.certs."denisejerome" = config.services.myCertificates.certConfig // {
diff --git a/nixops/modules/websites/ftp/denisejerome_goaccess.conf b/nixops/modules/websites/ftp/denisejerome_goaccess.conf
deleted file mode 100644
index 1379eae..0000000
--- a/nixops/modules/websites/ftp/denisejerome_goaccess.conf
+++ /dev/null
@@ -1,99 +0,0 @@
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/denisejerome.piedsjaloux.fr
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/nixops/modules/websites/ftp/immae.nix b/nixops/modules/websites/ftp/immae.nix
index 64e6a59..2ecca1f 100644
--- a/nixops/modules/websites/ftp/immae.nix
+++ b/nixops/modules/websites/ftp/immae.nix
@@ -17,10 +17,7 @@ in {
17 config = lib.mkIf cfg.production.enable { 17 config = lib.mkIf cfg.production.enable {
18 services.myWebsites.commons.stats.enable = true; 18 services.myWebsites.commons.stats.enable = true;
19 services.myWebsites.commons.stats.sites = [ 19 services.myWebsites.commons.stats.sites = [
20 { 20 { name = "www.immae.eu"; }
21 name = "www.immae.eu";
22 conf = ./immae_goaccess.conf;
23 }
24 ]; 21 ];
25 22
26 security.acme.certs."eldiron".extraDomains."www.immae.eu" = null; 23 security.acme.certs."eldiron".extraDomains."www.immae.eu" = null;
diff --git a/nixops/modules/websites/ftp/immae_goaccess.conf b/nixops/modules/websites/ftp/immae_goaccess.conf
deleted file mode 100644
index db65335..0000000
--- a/nixops/modules/websites/ftp/immae_goaccess.conf
+++ /dev/null
@@ -1,99 +0,0 @@
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/www.immae.eu
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/nixops/modules/websites/ftp/jerome.nix b/nixops/modules/websites/ftp/jerome.nix
index 610de02..e04d640 100644
--- a/nixops/modules/websites/ftp/jerome.nix
+++ b/nixops/modules/websites/ftp/jerome.nix
@@ -18,10 +18,7 @@ in {
18 config = lib.mkIf cfg.production.enable { 18 config = lib.mkIf cfg.production.enable {
19 services.myWebsites.commons.stats.enable = true; 19 services.myWebsites.commons.stats.enable = true;
20 services.myWebsites.commons.stats.sites = [ 20 services.myWebsites.commons.stats.sites = [
21 { 21 { name = "naturaloutil.immae.eu"; }
22 name = "naturaloutil.immae.eu";
23 conf = ./jerome_goaccess.conf;
24 }
25 ]; 22 ];
26 23
27 security.acme.certs."ftp".extraDomains."naturaloutil.immae.eu" = null; 24 security.acme.certs."ftp".extraDomains."naturaloutil.immae.eu" = null;
diff --git a/nixops/modules/websites/ftp/jerome_goaccess.conf b/nixops/modules/websites/ftp/jerome_goaccess.conf
deleted file mode 100644
index 83c59e2..0000000
--- a/nixops/modules/websites/ftp/jerome_goaccess.conf
+++ /dev/null
@@ -1,99 +0,0 @@
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/naturaloutil.immae.eu
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/nixops/modules/websites/ftp/leila.nix b/nixops/modules/websites/ftp/leila.nix
index ae917ba..d5c27fa 100644
--- a/nixops/modules/websites/ftp/leila.nix
+++ b/nixops/modules/websites/ftp/leila.nix
@@ -1,4 +1,4 @@
1{ lib, config, ... }: 1{ lib, pkgs, config, ... }:
2let 2let
3 cfg = config.services.myWebsites.Leila; 3 cfg = config.services.myWebsites.Leila;
4 varDir = "/var/lib/ftp/leila"; 4 varDir = "/var/lib/ftp/leila";
@@ -39,14 +39,8 @@ in {
39 39
40 services.myWebsites.commons.stats.enable = true; 40 services.myWebsites.commons.stats.enable = true;
41 services.myWebsites.commons.stats.sites = [ 41 services.myWebsites.commons.stats.sites = [
42 { 42 { name = "leila.bouya.org"; }
43 name = "leila.bouya.org"; 43 { name = "chorale.leila.bouya.org"; }
44 conf = ./leila_goaccess.conf;
45 }
46 {
47 name = "chorale.leila.bouya.org";
48 conf = ./leila_chorale_goaccess.conf;
49 }
50 ]; 44 ];
51 45
52 services.myWebsites.production.modules = [ "proxy_fcgi" ]; 46 services.myWebsites.production.modules = [ "proxy_fcgi" ];
diff --git a/nixops/modules/websites/ftp/leila_chorale_goaccess.conf b/nixops/modules/websites/ftp/leila_chorale_goaccess.conf
deleted file mode 100644
index 2c73b26..0000000
--- a/nixops/modules/websites/ftp/leila_chorale_goaccess.conf
+++ /dev/null
@@ -1,99 +0,0 @@
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/chorale.leila.bouya.org
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/nixops/modules/websites/ftp/leila_goaccess.conf b/nixops/modules/websites/ftp/leila_goaccess.conf
deleted file mode 100644
index 0c508bb..0000000
--- a/nixops/modules/websites/ftp/leila_goaccess.conf
+++ /dev/null
@@ -1,99 +0,0 @@
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/leila.bouya.org
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/nixops/modules/websites/ftp/nassime.nix b/nixops/modules/websites/ftp/nassime.nix
index 69576c0..d7ced7e 100644
--- a/nixops/modules/websites/ftp/nassime.nix
+++ b/nixops/modules/websites/ftp/nassime.nix
@@ -17,10 +17,7 @@ in {
17 config = lib.mkIf cfg.production.enable { 17 config = lib.mkIf cfg.production.enable {
18 services.myWebsites.commons.stats.enable = true; 18 services.myWebsites.commons.stats.enable = true;
19 services.myWebsites.commons.stats.sites = [ 19 services.myWebsites.commons.stats.sites = [
20 { 20 { name = "nassime.bouya.org"; }
21 name = "nassime.bouya.org";
22 conf = ./nassime_goaccess.conf;
23 }
24 ]; 21 ];
25 22
26 security.acme.certs."ftp".extraDomains."nassime.bouya.org" = null; 23 security.acme.certs."ftp".extraDomains."nassime.bouya.org" = null;
diff --git a/nixops/modules/websites/ftp/nassime_goaccess.conf b/nixops/modules/websites/ftp/nassime_goaccess.conf
deleted file mode 100644
index 6fca86c..0000000
--- a/nixops/modules/websites/ftp/nassime_goaccess.conf
+++ /dev/null
@@ -1,99 +0,0 @@
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/nassime.bouya.org
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/nixops/modules/websites/ftp/release.nix b/nixops/modules/websites/ftp/release.nix
index 78ee276..2050a6c 100644
--- a/nixops/modules/websites/ftp/release.nix
+++ b/nixops/modules/websites/ftp/release.nix
@@ -17,10 +17,7 @@ in {
17 config = lib.mkIf cfg.production.enable { 17 config = lib.mkIf cfg.production.enable {
18 services.myWebsites.commons.stats.enable = true; 18 services.myWebsites.commons.stats.enable = true;
19 services.myWebsites.commons.stats.sites = [ 19 services.myWebsites.commons.stats.sites = [
20 { 20 { name = "release.immae.eu"; }
21 name = "release.immae.eu";
22 conf = ./release_goaccess.conf;
23 }
24 ]; 21 ];
25 22
26 security.acme.certs."eldiron".extraDomains."release.immae.eu" = null; 23 security.acme.certs."eldiron".extraDomains."release.immae.eu" = null;
diff --git a/nixops/modules/websites/ftp/release_goaccess.conf b/nixops/modules/websites/ftp/release_goaccess.conf
deleted file mode 100644
index 2256a72..0000000
--- a/nixops/modules/websites/ftp/release_goaccess.conf
+++ /dev/null
@@ -1,99 +0,0 @@
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/release.immae.eu
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/nixops/modules/websites/ludivine/default.nix b/nixops/modules/websites/ludivine/default.nix
index 7fa33ed..af18d71 100644
--- a/nixops/modules/websites/ludivine/default.nix
+++ b/nixops/modules/websites/ludivine/default.nix
@@ -24,10 +24,7 @@ in {
24 secrets.keys = ludivinecassal_prod.keys; 24 secrets.keys = ludivinecassal_prod.keys;
25 services.myWebsites.commons.stats.enable = true; 25 services.myWebsites.commons.stats.enable = true;
26 services.myWebsites.commons.stats.sites = [ 26 services.myWebsites.commons.stats.sites = [
27 { 27 { name = "ludivinecassal.com"; }
28 name = "ludivinecassal.com";
29 conf = ./goaccess.conf;
30 }
31 ]; 28 ];
32 29
33 security.acme.certs."ludivinecassal" = config.services.myCertificates.certConfig // { 30 security.acme.certs."ludivinecassal" = config.services.myCertificates.certConfig // {
diff --git a/nixops/modules/websites/ludivine/goaccess.conf b/nixops/modules/websites/ludivine/goaccess.conf
deleted file mode 100644
index 25e5f63..0000000
--- a/nixops/modules/websites/ludivine/goaccess.conf
+++ /dev/null
@@ -1,99 +0,0 @@
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/ludivinecassal.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/nixops/modules/websites/piedsjaloux/default.nix b/nixops/modules/websites/piedsjaloux/default.nix
index d75170f..1657914 100644
--- a/nixops/modules/websites/piedsjaloux/default.nix
+++ b/nixops/modules/websites/piedsjaloux/default.nix
@@ -28,10 +28,7 @@ in {
28 secrets.keys = piedsjaloux_prod.keys; 28 secrets.keys = piedsjaloux_prod.keys;
29 services.myWebsites.commons.stats.enable = true; 29 services.myWebsites.commons.stats.enable = true;
30 services.myWebsites.commons.stats.sites = [ 30 services.myWebsites.commons.stats.sites = [
31 { 31 { name = "piedsjaloux.fr"; }
32 name = "piedsjaloux.fr";
33 conf = ./goaccess.conf;
34 }
35 ]; 32 ];
36 33
37 security.acme.certs."piedsjaloux" = config.services.myCertificates.certConfig // { 34 security.acme.certs."piedsjaloux" = config.services.myCertificates.certConfig // {
diff --git a/nixops/modules/websites/piedsjaloux/goaccess.conf b/nixops/modules/websites/piedsjaloux/goaccess.conf
deleted file mode 100644
index 3950f7e..0000000
--- a/nixops/modules/websites/piedsjaloux/goaccess.conf
+++ /dev/null
@@ -1,99 +0,0 @@
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/piedsjaloux.fr
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