diff --git a/.vib/apache/goss/apache.yaml b/.vib/apache/goss/apache.yaml index a0d2d5f042a5..580045463ab5 100644 --- a/.vib/apache/goss/apache.yaml +++ b/.vib/apache/goss/apache.yaml @@ -16,22 +16,22 @@ command: {{ end }} file: # Main Apache config file includes other config files - {{ .Vars.root_dir }}/apache/conf/httpd.conf: + /opt/bitnami/apache/conf/httpd.conf: exists: true filetype: file contains: - - /^Include.*{{ .Vars.root_dir }}/apache/conf/bitnami/bitnami.conf/ - - /^Include.*{{ .Vars.root_dir }}/apache/conf/vhosts/\*.conf/ - - /^Include.*{{ .Vars.root_dir }}/apache/conf/deflate.conf/ + - /^Include.*/opt/bitnami/apache/conf/bitnami/bitnami.conf/ + - /^Include.*/opt/bitnami/apache/conf/vhosts/\*.conf/ + - /^Include.*/opt/bitnami/apache/conf/deflate.conf/ # Main Bitnami config file was correctly generated - {{ .Vars.root_dir }}/apache/conf/bitnami/bitnami.conf: + /opt/bitnami/apache/conf/bitnami/bitnami.conf: exists: true filetype: file contains: - - /DocumentRoot.*{{ .Vars.root_dir }}/apache/htdocs/ - - /^Include.*{{ .Vars.root_dir }}/apache/conf/bitnami/bitnami-ssl.conf/ + - /DocumentRoot.*/opt/bitnami/apache/htdocs/ + - /^Include.*/opt/bitnami/apache/conf/bitnami/bitnami-ssl.conf/ # Main Bitnami ssl config file was correctly generated - {{ .Vars.root_dir }}/apache/conf/bitnami/bitnami-ssl.conf: + /opt/bitnami/apache/conf/bitnami/bitnami-ssl.conf: exists: true filetype: file contains: @@ -39,11 +39,11 @@ file: - /SSLCertificateFile.*bitnami/certs/server.crt/ - /SSLCertificateKeyFile.*bitnami/certs/server.key/ # CGI folder has been removed, as recommended by Apache - {{ .Vars.root_dir }}/apache/cgi-bin: + /opt/bitnami/apache/cgi-bin: exists: false # Compiled disabled modules should have been generated {{ range $module := .Vars.modules.extra }} - {{ $.Vars.root_dir }}/apache/modules/mod_{{ $module }}.so: + /opt/bitnami/apache/modules/mod_{{ $module }}.so: exists: true filetype: file {{ end }} diff --git a/.vib/apache/goss/goss.yaml b/.vib/apache/goss/goss.yaml index c26a8cfe05ee..43c4eb9800da 100644 --- a/.vib/apache/goss/goss.yaml +++ b/.vib/apache/goss/goss.yaml @@ -10,3 +10,4 @@ gossfile: ../../common/goss/templates/check-files.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/aspnet-core/goss/aspnet-core.yaml b/.vib/aspnet-core/goss/aspnet-core.yaml index a967fb6f2b34..80a8f8434dd6 100644 --- a/.vib/aspnet-core/goss/aspnet-core.yaml +++ b/.vib/aspnet-core/goss/aspnet-core.yaml @@ -1,6 +1,6 @@ command: check-bin-caps: - exec: getcap {{ .Vars.root_dir }}/aspnet-core/bin/dotnet + exec: getcap /opt/bitnami/aspnet-core/bin/dotnet stdout: - {{ .Vars.binary.capabilities }} exit-status: 0 diff --git a/.vib/aspnet-core/goss/goss.yaml b/.vib/aspnet-core/goss/goss.yaml index f3bd4d4db199..7ab4d1281516 100644 --- a/.vib/aspnet-core/goss/goss.yaml +++ b/.vib/aspnet-core/goss/goss.yaml @@ -9,3 +9,4 @@ gossfile: ../../common/goss/templates/check-directories.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/codeigniter/goss/goss.yaml b/.vib/codeigniter/goss/goss.yaml index d23b72c7377f..79ba82805072 100644 --- a/.vib/codeigniter/goss/goss.yaml +++ b/.vib/codeigniter/goss/goss.yaml @@ -8,4 +8,5 @@ gossfile: ../../common/goss/templates/check-binaries.yaml: {} ../../common/goss/templates/check-directories.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} - ../../common/goss/templates/check-sed-in-place.yaml: {} \ No newline at end of file + ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/dotnet-sdk/goss/dotnet-sdk.yaml b/.vib/dotnet-sdk/goss/dotnet-sdk.yaml index 41ded0847673..831d7509b6d3 100644 --- a/.vib/dotnet-sdk/goss/dotnet-sdk.yaml +++ b/.vib/dotnet-sdk/goss/dotnet-sdk.yaml @@ -1,6 +1,6 @@ command: check-bin-caps: - exec: getcap {{ .Vars.root_dir }}/dotnet-sdk/bin/dotnet + exec: getcap /opt/bitnami/dotnet-sdk/bin/dotnet stdout: - {{ .Vars.binary.capabilities }} exit-status: 0 diff --git a/.vib/dotnet-sdk/goss/goss.yaml b/.vib/dotnet-sdk/goss/goss.yaml index 3fe4def5e6f9..980d32fddab8 100644 --- a/.vib/dotnet-sdk/goss/goss.yaml +++ b/.vib/dotnet-sdk/goss/goss.yaml @@ -9,3 +9,4 @@ gossfile: ../../common/goss/templates/check-directories.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/dotnet/goss/dotnet.yaml b/.vib/dotnet/goss/dotnet.yaml index 38dcf1e7c29b..17c54762e2a4 100644 --- a/.vib/dotnet/goss/dotnet.yaml +++ b/.vib/dotnet/goss/dotnet.yaml @@ -1,6 +1,6 @@ command: check-bin-caps: - exec: getcap {{ .Vars.root_dir }}/dotnet/bin/dotnet + exec: getcap /opt/bitnami/dotnet/bin/dotnet stdout: - {{ .Vars.binary.capabilities }} exit-status: 0 diff --git a/.vib/dotnet/goss/goss.yaml b/.vib/dotnet/goss/goss.yaml index f33cef90e098..35304009f8bb 100644 --- a/.vib/dotnet/goss/goss.yaml +++ b/.vib/dotnet/goss/goss.yaml @@ -9,3 +9,4 @@ gossfile: ../../common/goss/templates/check-directories.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/express/goss/goss.yaml b/.vib/express/goss/goss.yaml index f3ee64e8b5be..68113789645e 100644 --- a/.vib/express/goss/goss.yaml +++ b/.vib/express/goss/goss.yaml @@ -6,3 +6,4 @@ gossfile: ../../common/goss/templates/check-directories.yaml: {} ../../common/goss/templates/check-files.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/golang/goss/goss.yaml b/.vib/golang/goss/goss.yaml index 45ebdb913d16..0e9871b7a87c 100644 --- a/.vib/golang/goss/goss.yaml +++ b/.vib/golang/goss/goss.yaml @@ -7,3 +7,4 @@ gossfile: ../../common/goss/templates/check-ca-certs.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/gradle/goss/goss.yaml b/.vib/gradle/goss/goss.yaml index 2223d9e5857a..49cc1604df93 100644 --- a/.vib/gradle/goss/goss.yaml +++ b/.vib/gradle/goss/goss.yaml @@ -7,3 +7,4 @@ gossfile: ../../common/goss/templates/check-ca-certs.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/java/goss/goss.yaml b/.vib/java/goss/goss.yaml index 1ad9bb989988..aee76762f432 100644 --- a/.vib/java/goss/goss.yaml +++ b/.vib/java/goss/goss.yaml @@ -7,3 +7,4 @@ gossfile: ../../common/goss/templates/check-ca-certs.yaml: {} ../../common/goss/templates/check-files.yaml: {} ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/jruby/goss/goss.yaml b/.vib/jruby/goss/goss.yaml index 8d492dbf4341..accb0e7fa5cf 100644 --- a/.vib/jruby/goss/goss.yaml +++ b/.vib/jruby/goss/goss.yaml @@ -7,3 +7,4 @@ gossfile: ../../common/goss/templates/check-ca-certs.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/mariadb/goss/goss.yaml b/.vib/mariadb/goss/goss.yaml index ea39ad96f0e8..ef79394f684b 100644 --- a/.vib/mariadb/goss/goss.yaml +++ b/.vib/mariadb/goss/goss.yaml @@ -9,3 +9,4 @@ gossfile: ../../common/goss/templates/check-directories.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/mariadb/goss/mariadb.yaml b/.vib/mariadb/goss/mariadb.yaml index fec80c568dca..d21259dde0cf 100644 --- a/.vib/mariadb/goss/mariadb.yaml +++ b/.vib/mariadb/goss/mariadb.yaml @@ -1,16 +1,16 @@ file: # Checks there is a template already loaded as a config file - {{ .Vars.root_dir }}/mariadb/conf/my.cnf: + /opt/bitnami/mariadb/conf/my.cnf: exists: true filetype: file contains: - - socket={{ .Vars.root_dir }}/mariadb/tmp/mysql.sock + - socket=/opt/bitnami/mariadb/tmp/mysql.sock # Checks the postunpack phase properly creates the plugin's symlink - {{ .Vars.root_dir }}/mariadb/lib/plugin: + /opt/bitnami/mariadb/lib/plugin: exists: true filetype: symlink # Check the plugins added at compilation time are available - {{ .Vars.root_dir }}/mariadb/plugin/auth_pam.so: + /opt/bitnami/mariadb/plugin/auth_pam.so: exists: true filetype: file mode: "0644" diff --git a/.vib/node/goss/goss.yaml b/.vib/node/goss/goss.yaml index d08582fc2287..a9eaca8006cb 100644 --- a/.vib/node/goss/goss.yaml +++ b/.vib/node/goss/goss.yaml @@ -8,4 +8,5 @@ gossfile: ../../common/goss/templates/check-ca-certs.yaml: {} ../../common/goss/templates/check-directories.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} - ../../common/goss/templates/check-sed-in-place.yaml: {} \ No newline at end of file + ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/python/goss/goss.yaml b/.vib/python/goss/goss.yaml index cd28b343a46b..40df57052d0d 100644 --- a/.vib/python/goss/goss.yaml +++ b/.vib/python/goss/goss.yaml @@ -8,3 +8,4 @@ gossfile: ../../common/goss/templates/check-ca-certs.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/rails/goss/goss.yaml b/.vib/rails/goss/goss.yaml index 7242791803a1..c6d4292038a8 100644 --- a/.vib/rails/goss/goss.yaml +++ b/.vib/rails/goss/goss.yaml @@ -7,4 +7,5 @@ gossfile: ../../common/goss/templates/check-ca-certs.yaml: {} ../../common/goss/templates/check-directories.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} - ../../common/goss/templates/check-sed-in-place.yaml: {} \ No newline at end of file + ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/rails/goss/vars.yaml b/.vib/rails/goss/vars.yaml index cf4192f10a7f..66f89da69423 100644 --- a/.vib/rails/goss/vars.yaml +++ b/.vib/rails/goss/vars.yaml @@ -5,6 +5,7 @@ binaries: - python - rails - ruby + - wait-for-port directories: - mode: "0775" paths: @@ -16,4 +17,4 @@ version: modules: - sqlite3 - mysql - - pg \ No newline at end of file + - pg diff --git a/.vib/wordpress/goss/goss.yaml b/.vib/wordpress/goss/goss.yaml index 98082c34dcfd..62a8e469e6ef 100644 --- a/.vib/wordpress/goss/goss.yaml +++ b/.vib/wordpress/goss/goss.yaml @@ -9,3 +9,4 @@ gossfile: ../../common/goss/templates/check-files.yaml: {} ../../common/goss/templates/check-linked-libraries.yaml: {} ../../common/goss/templates/check-sed-in-place.yaml: {} + ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/wordpress/goss/wordpress.yaml b/.vib/wordpress/goss/wordpress.yaml index c0bc2c70128c..df0b07388b33 100644 --- a/.vib/wordpress/goss/wordpress.yaml +++ b/.vib/wordpress/goss/wordpress.yaml @@ -1,6 +1,6 @@ command: check-app-version: - exec: cat {{ .Vars.root_dir }}/wordpress/wp-includes/version.php | grep "wp_version" + exec: cat /opt/bitnami/wordpress/wp-includes/version.php | grep "wp_version" exit-status: 0 stdout: - {{ .Env.APP_VERSION }} @@ -9,9 +9,9 @@ command: exec: wp --info exit-status: 0 stdout: - - "{{ .Vars.root_dir }}/php/bin/php" - - "{{ .Vars.root_dir }}/mysql/bin/mysql" - - "{{ .Vars.root_dir }}/wp-cli/conf/wp-cli.yml" + - "/opt/bitnami/php/bin/php" + - "/opt/bitnami/mysql/bin/mysql" + - "/opt/bitnami/wp-cli/conf/wp-cli.yml" check-enabled-modules: exec: php -m exit-status: 0 @@ -21,26 +21,26 @@ command: {{ end }} file: # HTTP vhost should have been properly rendered - {{ .Vars.root_dir }}/apache/conf/vhosts/wordpress-vhost.conf: + /opt/bitnami/apache/conf/vhosts/wordpress-vhost.conf: exists: true filetype: file contains: - "RewriteRule ^bitnami/wordpress(/.*) $1" - - /DocumentRoot.*{{ .Vars.root_dir }}/wordpress/ + - /DocumentRoot.*/opt/bitnami/wordpress/ # HTTPs vhost should have been properly rendered - {{ .Vars.root_dir }}/apache/conf/vhosts/wordpress-https-vhost.conf: + /opt/bitnami/apache/conf/vhosts/wordpress-https-vhost.conf: exists: true filetype: file contains: - "SSLEngine on" - "RewriteRule ^bitnami/wordpress(/.*) $1" - - /DocumentRoot.*{{ .Vars.root_dir }}/wordpress/ + - /DocumentRoot.*/opt/bitnami/wordpress/ # WP-CLI should point to wordpress' installation path - {{ .Vars.root_dir }}/wp-cli/conf/wp-cli.yml: + /opt/bitnami/wp-cli/conf/wp-cli.yml: exists: true filetype: file contains: - - /path.*{{ .Vars.root_dir }}/wordpress/ + - /path.*/opt/bitnami/wordpress/ group: daemon: exists: true