Add connexionswing production

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 172b3697f878c956b9262e01df6f69f0d9cce901..62b8364b094a8ba7cbd6c7135336f6967705ad4e 100644 (file)
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -175,20 +175,20 @@
           "www.osteopathe-cc.fr" = null;
         };
       };
-      # "connexionswing" = {
-      #   webroot = "/var/lib/acme/acme-challenge";
-      #   email = "ismael@bouya.org";
-      #   domain = "connexionswing.com";
-      #   plugins = [ "cert.pem" "chain.pem" "fullchain.pem" "full.pem" "key.pem" "account_key.json" ];
-      #   postRun = ''
-      #     systemctl reload httpd.service
-      #   '';
-      #   extraDomains = {
-      #     "www.connexionswing.com" = null;
-      #     "sandetludo.com" = null;
-      #     "www.sandetludo.com" = null;
-      #   };
-      # };
+      "connexionswing" = {
+        webroot = "/var/lib/acme/acme-challenge";
+        email = "ismael@bouya.org";
+        domain = "connexionswing.com";
+        plugins = [ "cert.pem" "chain.pem" "fullchain.pem" "full.pem" "key.pem" "account_key.json" ];
+        postRun = ''
+          systemctl reload httpd.service
+        '';
+        extraDomains = {
+          "www.connexionswing.com" = null;
+          "sandetludo.com" = null;
+          "www.sandetludo.com" = null;
+        };
+      };
     };
 
     services.openssh.extraConfig = ''
@@ -315,6 +315,7 @@
         mkdir -p /var/lib/goaccess/ludivinecassal.com
         mkdir -p /var/lib/goaccess/piedsjaloux.fr
         mkdir -p /var/lib/goaccess/osteopathe-cc.fr
+        mkdir -p /var/lib/goaccess/connexionswing.com
         '';
     };
 
@@ -472,6 +473,14 @@
             mypkgs.connexionswing_dev.apache.vhostConf
           ];
         })
+        (withConf "connexionswing" // {
+          hostName = "connexionswing.com";
+          serverAliases = [ "sandetludo.com" "www.connexionswing.com" "www.sandetludo.com" ];
+          documentRoot = mypkgs.connexionswing_prod.webRoot;
+          extraConfig = builtins.concatStringsSep "\n" [
+            mypkgs.connexionswing_prod.apache.vhostConf
+          ];
+        })
         (withConf "eldiron" // {
           hostName = "ludivine.immae.eu";
           documentRoot = mypkgs.ludivinecassal_dev.webRoot;
@@ -659,6 +668,7 @@
         "5 0 * * * root ${stats "ludivinecassal.com" ./packages/ludivinecassal_goaccess.conf}"
         "5 0 * * * root ${stats "piedsjaloux.fr" ./packages/piedsjaloux_goaccess.conf}"
         "5 0 * * * root ${stats "osteopathe-cc.fr" ./packages/chloe_goaccess.conf}"
+        "5 0 * * * root ${stats "connexionswing.com" ./packages/connexionswing_goaccess.conf}"
         ];
     };
 

diff --git a/virtual/packages/connexionswing.nix b/virtual/packages/connexionswing.nix
index 199c89327f0dc78b1e68d1dd76de4b4ea633de3e..1f3f2d51a22d53d0126e04f55923af006cc46116 100644 (file)
--- a/virtual/packages/connexionswing.nix
+++ b/virtual/packages/connexionswing.nix
@@ -121,6 +121,8 @@ let
 
       </Directory>
       '' else ''
+      Use Stats connexionswing.com
+
       <Directory ${webRoot}>
         Options Indexes FollowSymLinks MultiViews Includes
         AllowOverride All
@@ -158,6 +160,7 @@ let
 
         ln -sf ../../../../../${varDir}/{medias,uploads} web/images/
         ln -sf ${configRoot} app/config/parameters.yml
+        sed -i -e "/Incenteev..ParameterHandler..ScriptHandler::buildParameters/d" composer.json
         ${if environment == "dev" then "php bin/composer install" else ''
         SYMFONY_ENV=prod php bin/composer install --no-dev
         ./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 (file)
index 0000000..05ad083
--- /dev/null
+++ b/virtual/packages/connexionswing_goaccess.conf
@@ -0,0 +1,99 @@
+time-format %H:%M:%S
+date-format %d/%b/%Y
+
+#sur immae.eu
+#log-format %v %h %^[%d:%t %^] "%r" %s %b "%R" "%u" $^
+
+log-format VCOMBINED
+#= %v:%^ %h %^[%d:%t %^] "%r" %s %b "%R" "%u"
+
+html-prefs {"theme":"bright","layout":"vertical"}
+
+exclude-ip 188.165.209.148
+exclude-ip 178.33.252.96
+exclude-ip 2001:41d0:2:9c94::1
+exclude-ip 2001:41d0:2:9c94::
+exclude-ip 176.9.151.89
+exclude-ip 2a01:4f8:160:3445::
+exclude-ip 82.255.56.72
+
+no-query-string true
+
+keep-db-files true
+load-from-disk true
+db-path /var/lib/goaccess/connexionswing.com
+
+ignore-panel REFERRERS
+ignore-panel KEYPHRASES
+
+static-file .css
+static-file .js
+static-file .jpg
+static-file .png
+static-file .gif
+static-file .ico
+static-file .jpeg
+static-file .pdf
+static-file .csv
+static-file .mpeg
+static-file .mpg
+static-file .swf
+static-file .woff
+static-file .woff2
+static-file .xls
+static-file .xlsx
+static-file .doc
+static-file .docx
+static-file .ppt
+static-file .pptx
+static-file .txt
+static-file .zip
+static-file .ogg
+static-file .mp3
+static-file .mp4
+static-file .exe
+static-file .iso
+static-file .gz
+static-file .rar
+static-file .svg
+static-file .bmp
+static-file .tar
+static-file .tgz
+static-file .tiff
+static-file .tif
+static-file .ttf
+static-file .flv
+#static-file .less
+#static-file .ac3
+#static-file .avi
+#static-file .bz2
+#static-file .class
+#static-file .cue
+#static-file .dae
+#static-file .dat
+#static-file .dts
+#static-file .ejs
+#static-file .eot
+#static-file .eps
+#static-file .img
+#static-file .jar
+#static-file .map
+#static-file .mid
+#static-file .midi
+#static-file .ogv
+#static-file .webm
+#static-file .mkv
+#static-file .odp
+#static-file .ods
+#static-file .odt
+#static-file .otf
+#static-file .pict
+#static-file .pls
+#static-file .ps
+#static-file .qt
+#static-file .rm
+#static-file .svgz
+#static-file .wav
+#static-file .webp
+
+

diff --git a/virtual/packages/connexionswing_master.json b/virtual/packages/connexionswing_master.json
index 30c0c9677af43a1ade4da6952b1550f6693be735..2e1775b439252d6080e5f0d9142569344096888e 100644 (file)
--- a/virtual/packages/connexionswing_master.json
+++ b/virtual/packages/connexionswing_master.json
@@ -1,5 +1,5 @@
 {
-  "tag": "0c9458f-master",
+  "tag": "0330478-master",
   "meta": {
     "name": "connexionswing_master",
     "url": "gitolite@git.immae.eu:perso/Immae/Projets/Connexionswing",
@@ -7,8 +7,8 @@
   },
   "git": {
     "url": "gitolite@git.immae.eu:perso/Immae/Projets/Connexionswing",
-    "rev": "0c9458fadbda05e1ffc54956162ee92ad4dd6aef",
-    "sha256": "04blmpfpb6j57m032vpddcn1775bwx537zvv7fi25ip2yg507fjv",
+    "rev": "0330478cd256e6e36f525d3d0a247bad06de319f",
+    "sha256": "1sh97965winvbmpzqhjidhqry9840fa701wvr4vxywccyg4dyr17",
     "fetchSubmodules": true
   }
 }