Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nirina Malard
slapos
Commits
351f207b
Commit
351f207b
authored
Feb 02, 2023
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/master' into zope4py2
parents
dfb4cca5
8aa48865
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
70 additions
and
17 deletions
+70
-17
component/apache-php/buildout.cfg
component/apache-php/buildout.cfg
+4
-11
component/dropbear/buildout.cfg
component/dropbear/buildout.cfg
+3
-0
component/groff/buildout.cfg
component/groff/buildout.cfg
+4
-3
component/jasper/buildout.cfg
component/jasper/buildout.cfg
+3
-0
component/openldap/buildout.cfg
component/openldap/buildout.cfg
+2
-0
component/readline/buildout.cfg
component/readline/buildout.cfg
+2
-0
component/sed/buildout.cfg
component/sed/buildout.cfg
+2
-2
component/texinfo/buildout.cfg
component/texinfo/buildout.cfg
+11
-0
component/xorg/buildout.cfg
component/xorg/buildout.cfg
+4
-0
software/metabase/buildout.hash.cfg
software/metabase/buildout.hash.cfg
+1
-1
software/metabase/instance-metabase-input-schema.json
software/metabase/instance-metabase-input-schema.json
+23
-0
software/metabase/instance.cfg.in
software/metabase/instance.cfg.in
+11
-0
No files found.
component/apache-php/buildout.cfg
View file @
351f207b
...
...
@@ -74,7 +74,6 @@ configure-options =
--with-mysql=${mariadb:location}
--with-zlib-dir=${zlib:location}
--with-bz2=${bzip2:location}
--with-mcrypt=${libmcrypt:location}
--with-gd
--with-jpeg-dir=${libjpeg:location}
--with-png-dir=${libpng:location}
...
...
@@ -113,16 +112,10 @@ environment =
PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
CPPFLAGS=-I${libzip:location}/include
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${lib
mcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${zstd:location}/lib -L${libnsl:location}/lib -Wl,-rpath -Wl,${libnsl:location}/lib
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${lib
zip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${zstd:location}/lib -L${libnsl:location}/lib -Wl,-rpath -Wl,${libnsl:location}/lib
TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
HOME=${apache:location}
[libmcrypt]
recipe = slapos.recipe.cmmi
url = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2
md5sum = c4f491dd411a09e9de3b8702ea6f73eb
[xml-rpc]
recipe = slapos.recipe.cmmi
url = http://downloads.sourceforge.net/project/phpxmlrpc/phpxmlrpc/2.2.2/xmlrpc-2.2.2.tar.gz
...
...
component/dropbear/buildout.cfg
View file @
351f207b
...
...
@@ -9,6 +9,7 @@ extends =
../zlib/buildout.cfg
../coreutils/buildout.cfg
../patch/buildout.cfg
../gnu-config/buildout.cfg
parts =
dropbear-output
...
...
@@ -20,6 +21,8 @@ md5sum = 0284ea239083f04c8b874e08e1aca243
# in order have all patches working.
url = https://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
configure-options =
--with-zlib=${zlib:location}
CFLAGS="-DENABLE_SINGLEUSER -D__DIRTY_NO_SHELL_CHECKING"
...
...
component/groff/buildout.cfg
View file @
351f207b
...
...
@@ -4,14 +4,15 @@ parts =
extends =
../perl/buildout.cfg
../texinfo/buildout.cfg
[groff]
recipe = slapos.recipe.cmmi
shared = true
url = http://ftp.gnu.org/gnu/groff/groff-1.2
1
.tar.gz
md5sum =
8b8cd29385b97616a0f0d96d0951c5b
f
url = http://ftp.gnu.org/gnu/groff/groff-1.2
2.4
.tar.gz
md5sum =
08fb04335e2f5e73f23ea4c3adbf0c5
f
configure-options =
--disable-static
--without-x
environment =
PATH=${perl:location}/bin:%(PATH)s
PATH=${perl:location}/bin:
${texinfo7:location}/bin:
%(PATH)s
component/jasper/buildout.cfg
View file @
351f207b
[buildout]
extends =
../gnu-config/buildout.cfg
../libjpeg/buildout.cfg
../patch/buildout.cfg
parts =
jasper
...
...
@@ -13,6 +15,7 @@ md5sum = a342b2b4495b3e1394e161eb5d85d754
patch-options = -p1
patches =
${:_profile_base_location_}/jasper_1.900.1-debian1-2.4+deb8u3.patch#1cf61d1ebc87d355523d3484169671f7
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess acaux
configure-options =
--disable-static
--enable-shared
...
...
component/openldap/buildout.cfg
View file @
351f207b
...
...
@@ -2,6 +2,7 @@
parts =
openldap
extends =
../gnu-config/buildout.cfg
../groff/buildout.cfg
../openssl/buildout.cfg
../cyrus-sasl/buildout.cfg
...
...
@@ -11,6 +12,7 @@ recipe = slapos.recipe.cmmi
shared = true
url = http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.47.tgz
md5sum = e508f97bfd778fec7799f286e5c07176
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess build
configure-options =
--disable-static
--disable-slapd
...
...
component/readline/buildout.cfg
View file @
351f207b
[buildout]
extends =
../gnu-config/buildout.cfg
../ncurses/buildout.cfg
../patch/buildout.cfg
...
...
@@ -28,6 +29,7 @@ patches =
http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-013#3e2e5f543ed268a68fd1fa839faade1a
http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-014#a1be30e1c6f1099bb5fcef00a2631fb8
md5sum = e39331f32ad14009b9ff49cc10c5e751
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess support
configure-options =
--enable-multibyte
--disable-static
...
...
component/sed/buildout.cfg
View file @
351f207b
...
...
@@ -5,7 +5,7 @@ parts =
[sed]
recipe = slapos.recipe.cmmi
shared = true
url = ftp://ftp.gnu.org/gnu/sed/sed-4.
2.1
.tar.gz
md5sum =
f0fd4d7da574d4707e442285fd2d3b86
url = ftp://ftp.gnu.org/gnu/sed/sed-4.
9
.tar.gz
md5sum =
a50000a406f767bfa35db319704ef7b5
environment =
LDFLAGS =-Wl,--as-needed
component/texinfo/buildout.cfg
View file @
351f207b
...
...
@@ -17,3 +17,14 @@ configure-options =
environment =
CFLAGS=-I${ncurses:location}/include
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
[texinfo7]
recipe = slapos.recipe.cmmi
shared = true
url = http://ftp.gnu.org/gnu/texinfo/texinfo-7.0.tar.gz
md5sum = 49fccd9fb0ae12a2b0fa2a23ee2ade4d
configure-options =
--disable-static
environment =
CFLAGS=-I${ncurses:location}/include
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
component/xorg/buildout.cfg
View file @
351f207b
...
...
@@ -6,6 +6,7 @@ extends =
../bzip2/buildout.cfg
../dash/buildout.cfg
../freetype/buildout.cfg
../gnu-config/buildout.cfg
../gnutls/buildout.cfg
../icu/buildout.cfg
../intltool/buildout.cfg
...
...
@@ -46,6 +47,7 @@ recipe = slapos.recipe.cmmi
shared = true
url = https://www.x.org/releases/individual/proto/xproto-7.0.31.tar.gz
md5sum = 04b925bf9e472c80f9212615cd684f1e
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
configure-options =
--disable-specs
--without-xmlto
...
...
@@ -59,6 +61,7 @@ recipe = slapos.recipe.cmmi
shared = true
url = https://www.x.org/releases/individual/proto/xextproto-7.3.0.tar.gz
md5sum = 37b700baa8c8ea7964702d948dd13821
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
configure-options =
--disable-specs
--without-xmlto
...
...
@@ -263,6 +266,7 @@ recipe = slapos.recipe.cmmi
shared = true
url = https://www.x.org/releases/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
md5sum = a914ccc1de66ddeb4b611c6b0686e274
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
environment =
PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s
...
...
software/metabase/buildout.hash.cfg
View file @
351f207b
[instance-profile]
filename = instance.cfg.in
md5sum =
e0f4847f08e0062ea5a6ba492318afc7
md5sum =
0e109afd93153ecf062ad5e76bc86ea4
software/metabase/instance-metabase-input-schema.json
0 → 100644
View file @
351f207b
{
"$schema"
:
"http://json-schema.org/draft-04/schema#"
,
"type"
:
"object"
,
"properties"
:
{
"mb_password_complexity"
:
{
"title"
:
"Password complexity"
,
"description"
:
"Check Metabase documentation for more details."
,
"type"
:
"string"
,
"default"
:
"normal"
,
"enum"
:
[
"weak"
,
"normal"
,
"strong"
,
]
},
"mb_password_length"
:
{
"title"
:
"Password length"
,
"description"
:
"Password length"
,
"type"
:
"integer"
,
"default"
:
6
,
}
}
}
software/metabase/instance.cfg.in
View file @
351f207b
...
...
@@ -25,6 +25,15 @@ fonts =
includes =
${fontconfig:location}/etc/fonts/conf.d
[slap-parameter]
recipe = slapos.recipe.build
slapparameter-dict = $${slap-configuration:configuration}
home = $${buildout:directory}
init =
default_parameters = options.get('slapparameter-dict')
options['mb_password_complexity'] = default_parameters.get('mb_password_complexity', 'normal')
options['mb_password_length'] = default_parameters.get('mb_password_length', 6)
[metabase-instance]
recipe = slapos.cookbook:wrapper
wrapper-path = $${directory:service}/$${:_buildout_section_name_}
...
...
@@ -46,6 +55,8 @@ environment =
MB_DB_USER=$${postgresql:superuser}
MB_DB_PASS=$${postgresql:password}
MB_DB_HOST=$${postgresql:ipv4}
MB_PASSWORD_COMPLEXITY=$${slap-parameter:mb_password_complexity}
MB_PASSWORD_LENGTH=$${slap-parameter:mb_password_length}
FONTCONFIG_FILE=$${fontconfig-conf:output}
JAVA_ARGS=-Dorg.quartz.scheduler.instanceId=$${slap-connection:computer-id}.$${slap-connection:partition-id} -Djava.io.tmpdir="$${directory:tmp}"
hash-existing-files =
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment