fix moving over defaults during update

.env.example

@@ -5,6 +5,11 @@
 #
 # Use Dottie (https://github.com/jippi/dottie) to manage this .env file easier!
 #
+# For example:
+#
+#   Run [dottie update] to update your [.env] file with upstream (as part of upgrade)
+#   Run [dottie validate] to validate youe [.env] file
+#
 # @dottie/source .env.example
 
 ################################################################################
@@ -13,14 +18,16 @@
 
 # The name/title for your site
 # @see https://docs.pixelfed.org/technical-documentation/config/#app_name-1
-# @dottie/validate required,ne=My Pixelfed Site
-APP_NAME="My Pixelfed Site"
+# @dottie/example My Pixelfed Site
+# @dottie/validate required
+APP_NAME=
 
 # Application domain used for routing. (e.g., pixelfed.org)
 #
 # @see https://docs.pixelfed.org/technical-documentation/config/#app_domain
-# @dottie/validate required,ne=example.com,fqdn
-APP_DOMAIN="example.com"
+# @dottie/example example.com
+# @dottie/validate required,fqdn
+APP_DOMAIN=
 
 # This URL is used by the console to properly generate URLs when using the Artisan command line tool.
 # You should set this to the root of your application so that it is used when running Artisan tasks.
@@ -29,7 +36,7 @@ APP_DOMAIN="example.com"
 # @dottie/validate required,http_url
 APP_URL="https://${APP_DOMAIN}"
 
-# Application domains used for routing
+# Application domains used for routing.
 #
 # @see https://docs.pixelfed.org/technical-documentation/config/#admin_domain
 # @dottie/validate required,fqdn
@@ -363,8 +370,8 @@ DB_USERNAME="pixelfed"
 # Use a site like https://pwgen.io/ to generate it
 #
 # @see https://docs.pixelfed.org/technical-documentation/config/#db_password
-# @dottie/validate required,ne=__CHANGE_ME__
-DB_PASSWORD="__CHANGE_ME__"
+# @dottie/validate required
+DB_PASSWORD=
 
 # @see https://docs.pixelfed.org/technical-documentation/config/#db_database
 # @dottie/validate required
@@ -885,6 +892,7 @@ SESSION_DRIVER="redis"
 # 32 character string, otherwise these encrypted strings will not be safe.
 #
 # @see https://docs.pixelfed.org/technical-documentation/config/#app_key
+# @dottie/validate required
 APP_KEY=
 
 # Prefix for container names (without any dash at the end)
@@ -1221,4 +1229,4 @@ DOCKER_PROXY_LETSENCRYPT_EMAIL="${INSTANCE_CONTACT_EMAIL:?error}"
 # Lets Encrypt staging/test servers for certificate requests.
 #
 # Setting this to any value will change to letsencrypt test servers.
-DOCKER_PROXY_LETSENCRYPT_TEST="1"
+#DOCKER_PROXY_LETSENCRYPT_TEST="1"

pkg/ast/document.go

@@ -156,7 +156,7 @@ func (doc *Document) Upsert(input *Assignment, options UpsertOptions) (*Assignme
 		return nil, nil
 	}
 
-	if options.SkipIfSame && existing != nil && existing.Literal == input.Literal {
+	if options.SkipIfSame && existing != nil && existing.Literal == input.Literal && existing.Active == input.Active {
 		return nil, nil
 	}