diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37d7b15f7405d27ab859519f9c0af80032507d93..1e3186bf5158b5bd0a4e78dec9327a8679f3b3d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,3 +21,19 @@ system-tests: timeout: "3 hours" script: - "nix-shell --run 'nix-build nixos/system-tests.nix'" + +deploy-to-staging: + stage: "deploy" + only: + - "staging" + script: + - echo -n "Hello $GITLAB_USER_LOGIN from $CI_JOB_NAME. I was triggered by $CI_PIPELINE_SOURCE " + - echo "and would like to deploy the $CI_COMMIT_BRANCH branch to the staging environment." + +deploy-to-production: + stage: "deploy" + only: + - "production" + script: + - echo -n "Hello $GITLAB_USER_LOGIN from $CI_JOB_NAME. I was triggered by $CI_PIPELINE_SOURCE " + - echo "and would like to deploy the $CI_COMMIT_BRANCH branch to the production environment." diff --git a/README.rst b/README.rst index f789130688cce2d1e96015641540daad1076df77..d9e3e310ec775cbaec28019360befbcb535db9f6 100644 --- a/README.rst +++ b/README.rst @@ -1,3 +1,8 @@ +Project Hosting Moved +===================== + +This project can now be found at https://whetstone.privatestorage.io/opensource/PrivateStorageio + PrivateStorageio ================ diff --git a/morph/lib/bootstrap-configuration.nix b/morph/lib/bootstrap-configuration.nix index c639fb97b1e598c0f68a8c2e7a9cd6a2d0d9e93e..e26e345780d0d4da2d65e7b79af9c5e445a35e98 100644 --- a/morph/lib/bootstrap-configuration.nix +++ b/morph/lib/bootstrap-configuration.nix @@ -85,7 +85,7 @@ in ]; # Configure the bootloader how we like. - boot.loader.timeout = 1; + boot.loader.timeout = 10; boot.loader.grub.enable = true; boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/disk/by-id/${grubDeviceID}"; diff --git a/nixos/modules/100tb.nix b/nixos/modules/100tb.nix index 1bcb6ba176714ca3cfa5c527450dd9a3bc60684d..a8db0e8be56798e4491033bfaeec3e4d48c01a8f 100644 --- a/nixos/modules/100tb.nix +++ b/nixos/modules/100tb.nix @@ -105,7 +105,7 @@ in { boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/disk/by-id/${cfg.grubDeviceID}"; - boot.loader.timeout = 1; + boot.loader.timeout = 10; networking.firewall.enable = false; networking.hostId = cfg.hostId; diff --git a/nixos/pkgs/zkapauthorizer-repo.nix b/nixos/pkgs/zkapauthorizer-repo.nix index dffc40ed22d2fb0113fd033f1cf12c09b91eb0dd..595e7b4c8f6e5336fe48c50b22a7a9cc8b8d00db 100644 --- a/nixos/pkgs/zkapauthorizer-repo.nix +++ b/nixos/pkgs/zkapauthorizer-repo.nix @@ -4,6 +4,6 @@ in pkgs.fetchFromGitHub { owner = "PrivateStorageio"; repo = "ZKAPAuthorizer"; - rev = "6cd0c32cc53a9734e2cb7c19a9ad28d479612197"; - sha256 = "0i1r75471yjj4bfi5814ihrcyjk1zdz8rzm06bngij3n70svqhsm"; + rev = "e4430a0050cef286b723da7f8013c7affd5a58f7"; + sha256 = "148d79zppsd6bnyagbx126s9x9yy975dx6rrbm26dh98kl1r8mbh"; } \ No newline at end of file