diff --git a/.env.example b/.env.example index 554a21c..297f485 100644 --- a/.env.example +++ b/.env.example @@ -1,8 +1,8 @@ -APP_NAME=Laravel -APP_ENV=local +APP_NAME="Search and Displace" +APP_ENV=production APP_KEY=base64:R4JQ/hpbpPxTF++Kmcs530oqayc2OIKVslweftIPKiE= -APP_DEBUG=true -APP_URL=http://localhost +APP_DEBUG=false +APP_URL=https://core.searchanddisplace.com LOG_CHANNEL=daily @@ -10,16 +10,16 @@ DB_CONNECTION=sqlite BROADCAST_DRIVER=log CACHE_DRIVER=file -QUEUE_CONNECTION=sync +QUEUE_CONNECTION=redis SESSION_DRIVER=file SESSION_LIFETIME=120 REDIS_HOST=127.0.0.1 REDIS_PASSWORD=null REDIS_PORT=6379 -REDIS_QUEUE= +REDIS_QUEUE=sd_core SD_DUCKLING_URL=http://0.0.0.0:8000/parse -SD_INGEST_URL= +SD_INGEST_URL=https://ingest.searchanddisplace.com -WEBHOOK_CLIENT_SECRET= +WEBHOOK_CLIENT_SECRET=A5qayc2O53Vslw diff --git a/default.nix b/default.nix index 0df6cda..a6415f5 100644 --- a/default.nix +++ b/default.nix @@ -1,13 +1,17 @@ -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, noDev ? false}: +{ pkgs ? import {} }: +with pkgs; +{ + source = stdenv.mkDerivation { + name = "searchanddisplace-core-source"; + src = builtins.fetchGit { + url = "https://git.law/newroco/searchanddisplace-ingest.git"; + ref = "master"; + }; -let - composerEnv = import ./composer-env.nix { - inherit (pkgs) stdenv lib writeTextFile fetchurl php unzip phpPackages; - }; -in -import ./php-packages.nix { - inherit composerEnv noDev; - inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn; + phases = [ "installPhase" ]; + installPhase = '' + cp -r $src $out + composer install + ''; + }; }