fixup

software/peertube/instance.cfg.in

@@ -5,23 +5,18 @@ parts =
 [peertube-instance]
 recipe = slapos.cookbook:wrapper
 wrapper-path = $${directory:service}/$${:_buildout_section_name_}
-command-line = sh -c "cd $${directory:versions}; cp -r ${peertube-download:location} ./;
-# peertube yarn install --production --pure-lockfile"
-# cp peertube-latest/config/default.yaml config/default.yaml
-# cp peertube-latest/config/production.yaml.example config/production.yaml
-# cp /var/www/peertube/peertube-latest/support/nginx/peertube /etc/nginx/sites-available/peertube
-# sed -i 's/${WEBSERVER_HOST}/[peertube-domain]/g' /etc/nginx/sites-available/peertube
-# sed -i 's/${PEERTUBE_HOST}/127.0.0.1:9000/g' /etc/nginx/sites-available/peertube
+command-line = cd $${directory:versions}; cp -r ${peertube-download:location} ./
+  echo $${directory:versions}
+environment =
+  PATH=%(PATH)s
 
 [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
+peertube_directory = $${:srv}/var/www/peertube
+config = $${:srv}/var/www/peertube/config
+storage = $${:srv}/var/www/peertube/storage
+versions = $${:srv}/var/www/peertube/versions
 
 [postgresql-password]
 recipe = slapos.cookbook:generate.password

software/peertube/software.cfg

@@ -29,6 +29,7 @@ extends =
   ../../component/redis/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/wget/buildout.cfg
+  buildout.hash.cfg
 
 parts =
 # Call installation of slapos.cookbook egg defined in stack/slapos.cfg (needed
@@ -49,6 +50,7 @@ parts =
   wget
 # peetube sections
   peertube-download
+  instance-profile
 # postgresql-setup
 
 [nodejs]
@@ -61,9 +63,6 @@ url = https://github.com/Chocobozzz/PeerTube/releases/download/v4.2.2/peertube-v
 # md5sum =
 
 [instance-profile]
-<= jinja-template
-rendered = ${buildout:directory}/instance.cfg
-extensions = jinja2.ext.do
-context =
-  section buildout  buildout
-  raw template_monitor ${monitor2-template:rendered}
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/instance.cfg