peertube: remove default.yaml

software/peertube/buildout.hash.cfg

@@ -28,10 +28,6 @@ filename = template-peertube-service.sh.in
 filename = template-peertube-production.yaml.in
 # md5sum = 458870b70c33a1621b68961ae2372ad5
 
-[template-peertube-default]
-filename = template-peertube-default.yaml.in
-# md5sum = 458870b70c33a1621b68961ae2372ad5
-
 [template-nginx-configuration]
 filename = template-nginx.cfg.in
 # md5sum = 6b11e79bcc7734d8629e1b6e6cb497e1

software/peertube/instance.cfg.in

@@ -8,7 +8,6 @@ parts =
   postgresql
   nginx-service
   nginx-listen-promise
-  peertube-default-yaml
   peertube-production-yaml
   peertube-service
 
@@ -34,15 +33,10 @@ storage = $${:peertube_directory}/storage
 versions = $${:peertube_directory}/versions
 ssl = $${:etc}/ssl
 
-[peertube-default-yaml]
-recipe = slapos.recipe.template
-url = ${template-peertube-default:output}
-output = $${directory:config}/default.yaml
-
 [peertube-production-yaml]
 recipe = slapos.recipe.template
 url = ${template-peertube-production:output}
-output = $${directory:config}/production.yaml
+output = $${directory:config}/peertube.yaml
 
 [peertube-service]
 recipe = slapos.recipe.template

software/peertube/software.cfg

@@ -94,11 +94,6 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/${:filename}
 
-[template-peertube-default]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:directory}/${:filename}
-
 [template-nginx-service]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}

software/peertube/template-nginx.cfg.in

@@ -70,10 +70,10 @@ server {
     root /var/www/certbot;
   }
 
-  # ##
-  # # Security hardening (as of Nov 15, 2020)
-  # # based on Mozilla Guideline v5.6
-  # ##
+  ##
+  # Security hardening (as of Nov 15, 2020)
+  # based on Mozilla Guideline v5.6
+  ##
 
   # ssl_protocols             TLSv1.2 TLSv1.3;
   # ssl_prefer_server_ciphers on;
@@ -83,8 +83,8 @@ server {
   # ssl_session_tickets       off;
   # ssl_stapling              on;
   # ssl_stapling_verify       on;
-  # # HSTS (https://hstspreload.org), requires to be copied in 'location' sections that have add_header directives
-  # #add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+  # HSTS (https://hstspreload.org), requires to be copied in 'location' sections that have add_header directives
+  #add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
 
   ##
   # Application