software/peertube: split instance and software

software/peertube/instance.cfg.in

+[buildout]
+parts =
+  directory
+
+  [directory]
+recipe = slapos.cookbook:mkdirectory
+srv = $${buildout:directory}/srv
+var = $${:srv}/var
+www = $${:var}/www
+peertube_directory = ${:www}/peertube
+config = $${:peertube_directory}/config
+storage = $${:peertube_directory}/storage
+versions = $${:peertube_directory}/versions

software/peertube/software.cfg

@@ -22,6 +22,9 @@ extends =
   ../../component/postgresql/buildout.cfg
   ../../component/openssl/buildout.cfg
   ../../component/gcc/buildout.cfg
+  ../../component/libxml2/buildout.cfg
+  ../../component/libxslt/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
 # redis-server
   ../../component/redis/buildout.cfg
   ../../component/git/buildout.cfg
@@ -31,9 +34,7 @@ parts =
 # Call installation of slapos.cookbook egg defined in stack/slapos.cfg (needed
 # in 99,9% of Slapos Software Releases)
   slapos-cookbook
-# Call creation of instance.cfg file that will be called for deployment of
-# instance
-  instance-profile
+  gcc
   unzip
   curl
   vim
@@ -43,24 +44,15 @@ parts =
   nginx
   ffmpeg
   postgresql
-  gcc
   redis
   git
   wget
 # peetube sections
-  directory
-  peertube-download
-  postgresql
+#  peertube-download
+  postgresql-setup
 
-[directory]
-recipe = slapos.cookbook:mkdirectory
-srv = $${buildout:directory}/srv
-var = $${:srv}/var
-www = $${:var}/www
-peertube_directory = ${:www}/peertube
-config = $${:peertube_directory}/config
-storage = $${:peertube_directory}/storage
-versions = $${:peertube_directory}/versions
+[nodejs]
+<= nodejs-16.13.2
 
 [peertube-download]
 recipe = slapos.recipe.build:download
@@ -68,13 +60,14 @@ url = https://github.com/Chocobozzz/PeerTube/releases/download/v4.2.2/peertube-v
 destination = ${directory:versions}
 # md5sum =
 
-[postgresql]
-recipe = slapos.cookbook:postgres
-bin = ${postgresql10:location}/bin/
-services = $${directory:service}
-dbname  = peertube
-superuser = peertube
-password = $${postgresql-password:passwd}
-pgdata-directory = $${directory:srv}/postgresql
+
+[instance-profile]
+# The <= is buildout verb to use defined template
+<= jinja-template
+rendered = ${buildout:directory}/instance.cfg
+extensions = jinja2.ext.do
+context =
+  section buildout  buildout
+  raw template_monitor ${monitor2-template:rendered}