diff --git a/.env.example b/.env.example index 5490aaf..0388ece 100644 --- a/.env.example +++ b/.env.example @@ -1,8 +1,8 @@ -APP_NAME=Laravel -APP_ENV=local -APP_KEY= -APP_DEBUG=true -APP_URL=http://localhost +APP_NAME="Search and Displace Ingest" +APP_ENV=production +APP_KEY=base64:R4JQ/hpbpPxTF++Kmcs530oqayc2OIKVglweftIPKiE= +APP_DEBUG=false +APP_URL=http://localhost/ingest LOG_CHANNEL=stack @@ -15,9 +15,9 @@ SESSION_LIFETIME=120 REDIS_HOST=127.0.0.1 REDIS_PASSWORD=null REDIS_PORT=6379 -REDIS_QUEUE= +REDIS_QUEUE=sd_ingest -WEBHOOK_CORE_URL= -WEBHOOK_CORE_SECRET= +WEBHOOK_CORE_URL=http://localhost/core +WEBHOOK_CORE_SECRET=A5qayc2O53Vslw USER_HOME_PATH= diff --git a/README.md b/README.md index 92553c5..bf69d2f 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ S&D INGEST it's the module that receives row files in different formats and send ```bash apt-get update -apt-get install software-properies-common +apt-get install software-properties-common add-apt-repository ppa:deadsnakes/ppa apt-get install supervisor python3.8 python3.8-dev apt-get install redis-server diff --git a/default.nix b/default.nix index 0df6cda..eb62cae 100644 --- a/default.nix +++ b/default.nix @@ -1,13 +1,26 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, noDev ? false}: + }, system ? builtins.currentSystem, noDev ? true}: 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; +stdenv.mkDerivation { + name = "searchanddisplace-ingest-source"; + src = builtins.fetchGit { + url = "https://git.law/newroco/searchanddisplace-ingest.git"; + ref = "master"; + }; + + phases = [ "installPhase" ]; + installPhase = '' + cp -r $src $out + cp $out/.env.example $out/.env + cd $out + php artisan key:generate + php artisan queue:deploy-supervisor + supervisorctl start all + ''; }