Use stable channel and use helper function for acme challenge proxy
This commit is contained in:
		
					parent
					
						
							
								9c0398a3c1
							
						
					
				
			
			
				commit
				
					
						27a6513e84
					
				
			
		
					 21 changed files with 257 additions and 319 deletions
				
			
		| 
						 | 
				
			
			@ -1,8 +1,8 @@
 | 
			
		|||
{ ... }:
 | 
			
		||||
{ keyCommandEnv, ... }:
 | 
			
		||||
{
 | 
			
		||||
  deployment.keys = {
 | 
			
		||||
    "mastodon-secret-key-base.secret" = {
 | 
			
		||||
      keyCommand = [ "env" "GNUPGHOME=/home/yuri/.passinfra_gnupg" "PASSWORD_STORE_DIR=/home/yuri/pass/infra" "pass" "mastodon/secret-key-base" ];
 | 
			
		||||
      keyCommand = keyCommandEnv ++ [ "pass" "mastodon/secret-key-base" ];
 | 
			
		||||
      destDir = "/secrets";
 | 
			
		||||
      user = "mastodon";
 | 
			
		||||
      group = "mastodon";
 | 
			
		||||
| 
						 | 
				
			
			@ -10,7 +10,7 @@
 | 
			
		|||
      uploadAt = "pre-activation";
 | 
			
		||||
    };
 | 
			
		||||
    "mastodon-otp-secret.secret" = {
 | 
			
		||||
      keyCommand = [ "env" "GNUPGHOME=/home/yuri/.passinfra_gnupg" "PASSWORD_STORE_DIR=/home/yuri/pass/infra" "pass" "mastodon/otp-secret" ];
 | 
			
		||||
      keyCommand = keyCommandEnv ++ [ "pass" "mastodon/otp-secret" ];
 | 
			
		||||
      destDir = "/secrets";
 | 
			
		||||
      user = "mastodon";
 | 
			
		||||
      group = "mastodon";
 | 
			
		||||
| 
						 | 
				
			
			@ -18,7 +18,7 @@
 | 
			
		|||
      uploadAt = "pre-activation";
 | 
			
		||||
    };
 | 
			
		||||
    "mastodon-vapid-private-key.secret" = {
 | 
			
		||||
      keyCommand = [ "env" "GNUPGHOME=/home/yuri/.passinfra_gnupg" "PASSWORD_STORE_DIR=/home/yuri/pass/infra" "pass" "mastodon/vapid-private-key" ];
 | 
			
		||||
      keyCommand = keyCommandEnv ++ [ "pass" "mastodon/vapid-private-key" ];
 | 
			
		||||
      destDir = "/secrets";
 | 
			
		||||
      user = "mastodon";
 | 
			
		||||
      group = "mastodon";
 | 
			
		||||
| 
						 | 
				
			
			@ -26,7 +26,7 @@
 | 
			
		|||
      uploadAt = "pre-activation";
 | 
			
		||||
    };
 | 
			
		||||
    "mastodon-email-smtp-pass.secret" = {
 | 
			
		||||
      keyCommand = [ "env" "GNUPGHOME=/home/yuri/.passinfra_gnupg" "PASSWORD_STORE_DIR=/home/yuri/pass/infra" "pass" "mastodon/email-smtp-pass" ];
 | 
			
		||||
      keyCommand = keyCommandEnv ++ [ "pass" "mastodon/email-smtp-pass" ];
 | 
			
		||||
      destDir = "/secrets";
 | 
			
		||||
      user = "mastodon";
 | 
			
		||||
      group = "mastodon";
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue