| 
				
			 | 
			
			
				@@ -72,6 +72,26 @@ function upgrade_keyserver { 
			 | 
		
	
		
			
			| 
				72
			 | 
			
				72
			 | 
			
			
				     function_check set_repo_commit 
			 | 
		
	
		
			
			| 
				73
			 | 
			
				73
			 | 
			
			
				     set_repo_commit /var/www/$KEYSERVER_DOMAIN_NAME/htdocs "keyserver web commit" "$KEYSERVER_WEB_COMMIT" $KEYSERVER_WEB_REPO 
			 | 
		
	
		
			
			| 
				74
			 | 
			
				74
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				
			 | 
			
				75
			 | 
			
			
				+    read_config_param MY_USERNAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				76
			 | 
			
			
				+    USER_EMAIL_ADDRESS=$MY_USERNAME@$HOSTNAME 
			 | 
		
	
		
			
			| 
				
			 | 
			
				77
			 | 
			
			
				+    GPG_ID=$(su -m root -c "gpg --list-keys $USER_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//'" - $MY_USERNAME) 
			 | 
		
	
		
			
			| 
				
			 | 
			
				78
			 | 
			
			
				+    if [ ! $GPG_ID ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				79
			 | 
			
			
				+        echo $'No GPG ID for admin user' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				80
			 | 
			
			
				+        exit 846336 
			 | 
		
	
		
			
			| 
				
			 | 
			
				81
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				82
			 | 
			
			
				+    if [ ${#GPG_ID} -lt 5 ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				83
			 | 
			
			
				+        echo $'GPG ID not retrieved for admin user' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				84
			 | 
			
			
				+        exit 835292 
			 | 
		
	
		
			
			| 
				
			 | 
			
				85
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				86
			 | 
			
			
				+    if [[ "$GPG_ID" == *"error"* ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				87
			 | 
			
			
				+        echo $'GPG ID not retrieved for admin user due to error' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				88
			 | 
			
			
				+        exit 74825 
			 | 
		
	
		
			
			| 
				
			 | 
			
				89
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				90
			 | 
			
			
				+    sed -i "s|###ENTERPUBLICKEYHERE###|$GPG_ID|g" /var/www/$KEYSERVER_DOMAIN_NAME/htdocs/404.html 
			 | 
		
	
		
			
			| 
				
			 | 
			
				91
			 | 
			
			
				+    sed -i "s|###ENTERPUBLICKEYHERE###|$GPG_ID|g" /var/www/$KEYSERVER_DOMAIN_NAME/htdocs/index.html 
			 | 
		
	
		
			
			| 
				
			 | 
			
				92
			 | 
			
			
				+    sed -i "s|###ENTERNAMEHERE###|$USER_EMAIL_ADDRESS|g" /var/www/$KEYSERVER_DOMAIN_NAME/htdocs/404.html 
			 | 
		
	
		
			
			| 
				
			 | 
			
				93
			 | 
			
			
				+    sed -i "s|###ENTERNAMEHERE###|$USER_EMAIL_ADDRESS|g" /var/www/$KEYSERVER_DOMAIN_NAME/htdocs/index.html 
			 | 
		
	
		
			
			| 
				
			 | 
			
				94
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				75
			 | 
			
				95
			 | 
			
			
				     chown -R www-data:www-data /var/www/$KEYSERVER_DOMAIN_NAME/htdocs 
			 | 
		
	
		
			
			| 
				76
			 | 
			
				96
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				77
			 | 
			
				97
			 | 
			
			
				  
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -229,6 +249,10 @@ function install_keyserver { 
			 | 
		
	
		
			
			| 
				229
			 | 
			
				249
			 | 
			
			
				         echo $'GPG ID not retrieved for admin user due to error' 
			 | 
		
	
		
			
			| 
				230
			 | 
			
				250
			 | 
			
			
				         exit 74825 
			 | 
		
	
		
			
			| 
				231
			 | 
			
				251
			 | 
			
			
				     fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				252
			 | 
			
			
				+    sed -i "s|###ENTERPUBLICKEYHERE###|$GPG_ID|g" /var/www/$KEYSERVER_DOMAIN_NAME/htdocs/404.html 
			 | 
		
	
		
			
			| 
				
			 | 
			
				253
			 | 
			
			
				+    sed -i "s|###ENTERPUBLICKEYHERE###|$GPG_ID|g" /var/www/$KEYSERVER_DOMAIN_NAME/htdocs/index.html 
			 | 
		
	
		
			
			| 
				
			 | 
			
				254
			 | 
			
			
				+    sed -i "s|###ENTERNAMEHERE###|$USER_EMAIL_ADDRESS|g" /var/www/$KEYSERVER_DOMAIN_NAME/htdocs/404.html 
			 | 
		
	
		
			
			| 
				
			 | 
			
				255
			 | 
			
			
				+    sed -i "s|###ENTERNAMEHERE###|$USER_EMAIL_ADDRESS|g" /var/www/$KEYSERVER_DOMAIN_NAME/htdocs/index.html 
			 | 
		
	
		
			
			| 
				232
			 | 
			
				256
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				233
			 | 
			
				257
			 | 
			
			
				     sksconf_file=/var/lib/sks/sksconf 
			 | 
		
	
		
			
			| 
				234
			 | 
			
				258
			 | 
			
			
				     echo 'debuglevel: 3' > $sksconf_file 
			 |