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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Douglas
slapos
Commits
82418343
Commit
82418343
authored
Aug 25, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into slapos
parents
26652905
5718ea2a
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
295 additions
and
1 deletion
+295
-1
component/noVNC/buildout.cfg
component/noVNC/buildout.cfg
+1
-1
software/kvm/software.cfg
software/kvm/software.cfg
+8
-0
software/lamp-template-static/instance.cfg
software/lamp-template-static/instance.cfg
+10
-0
software/lamp-template-static/software.cfg
software/lamp-template-static/software.cfg
+55
-0
software/lamp-template/instance.cfg
software/lamp-template/instance.cfg
+17
-0
software/lamp-template/software.cfg
software/lamp-template/software.cfg
+67
-0
software/lamp-template/template/phpmyadmin.inc.php.in
software/lamp-template/template/phpmyadmin.inc.php.in
+25
-0
software/lamp-template/template/wp-config.php.in
software/lamp-template/template/wp-config.php.in
+90
-0
software/nbd/software.cfg
software/nbd/software.cfg
+5
-0
stack/kvm.cfg
stack/kvm.cfg
+16
-0
stack/nbd.cfg
stack/nbd.cfg
+1
-0
No files found.
component/noVNC/buildout.cfg
View file @
82418343
...
@@ -4,5 +4,5 @@ parts =
...
@@ -4,5 +4,5 @@ parts =
[noVNC]
[noVNC]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = https://github.com/kanaka/noVNC/tarball/
master
url = https://github.com/kanaka/noVNC/tarball/
v0.1
strip-top-level-dir = true
strip-top-level-dir = true
software/kvm/software.cfg
View file @
82418343
...
@@ -75,3 +75,11 @@ zc.recipe.egg = 1.3.2
...
@@ -75,3 +75,11 @@ zc.recipe.egg = 1.3.2
# Required by:
# Required by:
# slapos.core==0.9
# slapos.core==0.9
zope.interface = 3.6.4
zope.interface = 3.6.4
# Required by:
# novnc==0.1
numpy = 1.6.1
# XXX-CEDRIC Quick and dirty workaround to avoid m2crypto problems.
# should not be used elsewhere unless for urgent cases.
slapos.libnetworkcache = 0.2
software/lamp-template-static/instance.cfg
0 → 100644
View file @
82418343
[buildout]
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
parts = instance
[instance]
recipe = ${instance-recipe:egg}:${instance-recipe:module}
source = ${application:location}
httpd_binary = ${apache:location}/bin/httpd
software/lamp-template-static/software.cfg
0 → 100644
View file @
82418343
[buildout]
versions = versions
parts =
template
apache
eggs
instance-recipe-egg
downloadcache-workaround
extends =
http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/stack/lamp.cfg
http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/component/apache/buildout.cfg
http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/stack/shacache-client.cfg
[application]
recipe = hexagonit.recipe.download
url = Student shall put here url of zipped or tarballed web page or application
#md5sum = Student may put here md5sum of this file, this is good idea
#If provided tarball does not contain top directory, option shall be changed to false
#strip-top-level-dir = true
[instance-recipe]
egg = slapos.cookbook
module = osoeslaptraining.static
[template]
# Default template for the instance.
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
#md5sum = Student shall put md5 of instance.cfg here
output = ${buildout:directory}/template.cfg
mode = 0644
[instance-recipe-egg]
recipe = zc.recipe.egg
python = python2.7
eggs = ${instance-recipe:egg}
[versions]
# Use SlapOS patched zc.buildout
zc.buildout = 1.5.3-dev-SlapOS-005
[downloadcache-workaround]
# workaround irritating problem of hexagonit.recipe.cmmi which automatically
# creates download cache, which in turn switches builout to "semi-offline" mode
recipe = plone.recipe.command
# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves
# to ${buildout:directory}/downloads but this variable is available late, that's
# why it is hardcoded only for required case
download-cache = ${buildout:directory}/downloads
command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
update-command = ${:command}
stop-on-error = True
software/lamp-template/instance.cfg
0 → 100644
View file @
82418343
[buildout]
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
parts = instance
[instance]
recipe = ${instance-recipe:egg}:${instance-recipe:module}
source = ${application:location}
template = ${application-template:location}/${application-template:filename}
configuration = ${application-configuration:location}
httpd_binary = ${apache:location}/bin/httpd
mysql_binary = ${mariadb:location}/bin/mysql
mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
mysqld_binary = ${mariadb:location}/libexec/mysqld
software/lamp-template/software.cfg
0 → 100644
View file @
82418343
[buildout]
versions = versions
parts =
template
apache-php
mariadb
eggs
instance-recipe-egg
downloadcache-workaround
extends =
http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/stack/lamp.cfg
http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/stack/shacache-client.cfg
[application]
recipe = hexagonit.recipe.download
url = Student shall put here url of zipped or tarballed web page or application
#md5sum = Student may put here md5sum of this file, this is good idea
#If provided tarball does not contain top directory, option shall be changed to false
#strip-top-level-dir = true
[application-template]
recipe = slapos.recipe.download
url = Student shall put here url to template file for application
#md5sum = Student may put here md5sum of this file, this is good idea
download-only = True
filename = template.in
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[application-configuration]
location = Student shall put here relative path to application top level directory where configuration shall be created
[instance-recipe]
egg = slapos.cookbook
module = osoeslaptraining.simple
[template]
# Default template for the instance.
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
#md5sum = Student shall put md5 of instance.cfg here
output = ${buildout:directory}/template.cfg
mode = 0644
[instance-recipe-egg]
recipe = zc.recipe.egg
python = python2.7
eggs = ${instance-recipe:egg}
[versions]
# Use SlapOS patched zc.buildout
zc.buildout = 1.5.3-dev-SlapOS-005
[downloadcache-workaround]
# workaround irritating problem of hexagonit.recipe.cmmi which automatically
# creates download cache, which in turn switches builout to "semi-offline" mode
recipe = plone.recipe.command
# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves
# to ${buildout:directory}/downloads but this variable is available late, that's
# why it is hardcoded only for required case
download-cache = ${buildout:directory}/downloads
command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
update-command = ${:command}
stop-on-error = True
software/lamp-template/template/phpmyadmin.inc.php.in
0 → 100644
View file @
82418343
<?php
$cfg
[
'blowfish_secret'
]
=
''
;
/* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
$i
=
0
;
$i
++
;
/* Server parameters */
$cfg
[
'Servers'
][
$i
][
'host'
]
=
'Put here mysql host template key'
;
$cfg
[
'Servers'
][
$i
][
'port'
]
=
'Put here mysql port template key'
;
/* Authentication type */
$cfg
[
'Servers'
][
$i
][
'auth_type'
]
=
'cookie'
;
$cfg
[
'Servers'
][
$i
][
'user'
]
=
''
;
$cfg
[
'Servers'
][
$i
][
'connect_type'
]
=
'tcp'
;
$cfg
[
'Servers'
][
$i
][
'compress'
]
=
false
;
/* Select mysqli if your server has it */
$cfg
[
'Servers'
][
$i
][
'extension'
]
=
'mysql'
;
$cfg
[
'Servers'
][
$i
][
'AllowNoPassword'
]
=
false
;
/* rajk - for blobstreaming */
$cfg
[
'Servers'
][
$i
][
'bs_garbage_threshold'
]
=
50
;
$cfg
[
'Servers'
][
$i
][
'bs_repository_threshold'
]
=
'32M'
;
$cfg
[
'Servers'
][
$i
][
'bs_temp_blob_timeout'
]
=
600
;
$cfg
[
'Servers'
][
$i
][
'bs_temp_log_threshold'
]
=
'32M'
;
$cfg
[
'UploadDir'
]
=
''
;
$cfg
[
'SaveDir'
]
=
''
;
?>
software/lamp-template/template/wp-config.php.in
0 → 100644
View file @
82418343
<?php
/**
* The base configurations of the WordPress.
*
* This file has the following configurations: MySQL settings, Table Prefix,
* Secret Keys, WordPress Language, and ABSPATH. You can find more information
* by visiting {@link http://codex.wordpress.org/Editing_wp-config.php Editing
* wp-config.php} Codex page. You can get the MySQL settings from your web host.
*
* This file is used by the wp-config.php creation script during the
* installation. You don't have to use the web site, you can just copy this file
* to "wp-config.php" and fill in the values.
*
* @package WordPress
*/
// ** MySQL settings - You can get this info from your web host ** //
/** The name of the database for WordPress */
define
(
'DB_NAME'
,
'Put here mysql database name template key'
);
/** MySQL database username */
define
(
'DB_USER'
,
'Put here mysql user template key'
);
/** MySQL database password */
define
(
'DB_PASSWORD'
,
'Put here mysql password template key'
);
/** MySQL hostname */
define
(
'DB_HOST'
,
'Put here mysql host template key'
);
/** Database Charset to use in creating database tables. */
define
(
'DB_CHARSET'
,
'utf8'
);
/** The Database Collate type. Don't change this if in doubt. */
define
(
'DB_COLLATE'
,
''
);
/**#@+
* Authentication Unique Keys and Salts.
*
* Change these to different unique phrases!
* You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}
* You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
*
* @since 2.6.0
*/
define
(
'AUTH_KEY'
,
'put your unique phrase here'
);
define
(
'SECURE_AUTH_KEY'
,
'put your unique phrase here'
);
define
(
'LOGGED_IN_KEY'
,
'put your unique phrase here'
);
define
(
'NONCE_KEY'
,
'put your unique phrase here'
);
define
(
'AUTH_SALT'
,
'put your unique phrase here'
);
define
(
'SECURE_AUTH_SALT'
,
'put your unique phrase here'
);
define
(
'LOGGED_IN_SALT'
,
'put your unique phrase here'
);
define
(
'NONCE_SALT'
,
'put your unique phrase here'
);
/**#@-*/
/**
* WordPress Database Table prefix.
*
* You can have multiple installations in one database if you give each a unique
* prefix. Only numbers, letters, and underscores please!
*/
$table_prefix
=
'wp_'
;
/**
* WordPress Localized Language, defaults to English.
*
* Change this to localize WordPress. A corresponding MO file for the chosen
* language must be installed to wp-content/languages. For example, install
* de_DE.mo to wp-content/languages and set WPLANG to 'de_DE' to enable German
* language support.
*/
define
(
'WPLANG'
,
''
);
/**
* For developers: WordPress debugging mode.
*
* Change this to true to enable the display of notices during development.
* It is strongly recommended that plugin and theme developers use WP_DEBUG
* in their development environments.
*/
define
(
'WP_DEBUG'
,
false
);
/* That's all, stop editing! Happy blogging. */
/** Absolute path to the WordPress directory. */
if
(
!
defined
(
'ABSPATH'
)
)
define
(
'ABSPATH'
,
dirname
(
__FILE__
)
.
'/'
);
/** Sets up WordPress vars and included files. */
require_once
(
ABSPATH
.
'wp-settings.php'
);
software/nbd/software.cfg
View file @
82418343
...
@@ -13,3 +13,8 @@ url = ${:_profile_base_location_}/instance.cfg
...
@@ -13,3 +13,8 @@ url = ${:_profile_base_location_}/instance.cfg
md5sum = 82e948e1c0cb0d5540ef185edeef3ec3
md5sum = 82e948e1c0cb0d5540ef185edeef3ec3
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
[versions]
# XXX-CEDRIC Quick and dirty workaround to avoid m2crypto problems.
# should not be used elsewhere unless for urgent cases.
slapos.libnetworkcache = 0.2
stack/kvm.cfg
View file @
82418343
...
@@ -14,6 +14,21 @@ extends =
...
@@ -14,6 +14,21 @@ extends =
../component/dcron/buildout.cfg
../component/dcron/buildout.cfg
../component/libpng/buildout.cfg
../component/libpng/buildout.cfg
#XXX-Cedric : Currently, one can only access to KVM using noVNC.
# Ideally one should be able to access KVM by using either NoVNC or VNC.
# Problem is : no native crypto support in web browsers. So we have to disable ssl
# In qemu builtin vnc server, and make it available only for localhost
# so that only novnc can listen to it.
#XXX-Cedric: Check status of https://github.com/kanaka/noVNC/issues/13 to see
# When qemu has builtin support for websockets in vnc server to get rid of
# Websockify (socket <-> websocket proxy server) when it is ready.
# May solve previous XXX depending on the implementation.
#XXX-Cedric: Check status of
# https://www.tiolive.com/nexedi/bug_module/20110819-11F4F70 for
# Chrome >= 14 and Firefox >=7 can access to noVNC.
parts =
parts =
template
template
gnutls
gnutls
...
@@ -87,6 +102,7 @@ recipe = z3c.recipe.scripts
...
@@ -87,6 +102,7 @@ recipe = z3c.recipe.scripts
eggs =
eggs =
${lxml-python:egg}
${lxml-python:egg}
slapos.cookbook
slapos.cookbook
numpy
[versions]
[versions]
zc.buildout = 1.5.3-dev-SlapOS-005
zc.buildout = 1.5.3-dev-SlapOS-005
stack/nbd.cfg
View file @
82418343
...
@@ -62,6 +62,7 @@ module = nbdserver
...
@@ -62,6 +62,7 @@ module = nbdserver
[eggs]
[eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs =
eggs =
${lxml-python:egg}
slapos.toolbox
slapos.toolbox
slapos.cookbook
slapos.cookbook
pyOpenSSL
pyOpenSSL
...
...
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