From b359eea7f6e84bb9939611ee131a3389743a18c8 Mon Sep 17 00:00:00 2001 From: Lucian Pricop Date: Thu, 30 Dec 2021 16:53:21 +0200 Subject: [PATCH] update nix and env.example --- .env.example | 6 +++--- README.md | 6 +----- default.nix | 7 ++++++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.env.example b/.env.example index 297f485..371aac6 100644 --- a/.env.example +++ b/.env.example @@ -1,8 +1,8 @@ -APP_NAME="Search and Displace" +APP_NAME="Search and Displace Core" APP_ENV=production APP_KEY=base64:R4JQ/hpbpPxTF++Kmcs530oqayc2OIKVslweftIPKiE= APP_DEBUG=false -APP_URL=https://core.searchanddisplace.com +APP_URL=http://localhost/core LOG_CHANNEL=daily @@ -20,6 +20,6 @@ REDIS_PORT=6379 REDIS_QUEUE=sd_core SD_DUCKLING_URL=http://0.0.0.0:8000/parse -SD_INGEST_URL=https://ingest.searchanddisplace.com +SD_INGEST_URL=http://localhost/ingest WEBHOOK_CLIENT_SECRET=A5qayc2O53Vslw diff --git a/README.md b/README.md index 1656c5b..b55568c 100644 --- a/README.md +++ b/README.md @@ -33,10 +33,6 @@ details about installing Facebook Duckling in a section below. `composer install` -- Generate the app key by running the following command: - -`php artisan key:generate` - - Install NodeJS and npm - Install npm dependencies @@ -44,7 +40,7 @@ details about installing Facebook Duckling in a section below. - Compile frontend assets -`npm run dev` or `npm run watch` if you want to run a watcher +`npm run prod` - Generate the app key by running the following command: diff --git a/default.nix b/default.nix index 7767337..62ff5ed 100644 --- a/default.nix +++ b/default.nix @@ -14,12 +14,17 @@ in stdenv.mkDerivation { name = "searchanddisplace-core-source"; src = builtins.fetchGit { - url = "https://git.law/newroco/searchanddisplace-ingest.git"; + url = "https://git.law/newroco/searchanddisplace-core.git"; ref = "master"; }; phases = [ "installPhase" ]; installPhase = '' cp -r $src $out + cp $out/.env.example $out/.env + cd $out + npm run prod + php artisan key:generate + php artisan migrate ''; }