summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2014-05-01 21:23:15 +0000
committerPaul Sherwood <paul.sherwood@codethink.co.uk>2014-05-03 22:00:55 +0000
commitdf5c47124df94b54b439e00a42048b23c5e4a198 (patch)
tree3b01c5c31e87e407ca23d4df863f49562a376050
parent2c8e0cebfcdf3f81c628a6023745842a25a3913f (diff)
parent63b6369423feb1622eac4aa28927777c65e0ed37 (diff)
downloaddefinitions-df5c47124df94b54b439e00a42048b23c5e4a198.tar.gz
Merge remote-tracking branch 'origin/baserock/ps/proto-web-system' into baserock/ps/proto-web-system
Conflicts: bsp-x86_64-generic.morph core.morph gtk2.morph
-rw-r--r--bsp-x86_64-generic.morph2
-rw-r--r--databases.morph28
-rw-r--r--erlang-things.morph17
-rw-r--r--gtk2.morph4
-rw-r--r--useful.morph59
-rw-r--r--vboxdeploy.morph14
-rw-r--r--web-system.morph20
7 files changed, 141 insertions, 3 deletions
diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph
index a824fdfc..dce7077b 100644
--- a/bsp-x86_64-generic.morph
+++ b/bsp-x86_64-generic.morph
@@ -7,7 +7,7 @@ build-depends:
chunks:
- name: linux
repo: upstream:linux
- ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
+ ref: baserock/ps/proto-web-system
unpetrify-ref: baserock/morph
build-depends: []
- name: nasm
diff --git a/databases.morph b/databases.morph
new file mode 100644
index 00000000..1e0e08f8
--- /dev/null
+++ b/databases.morph
@@ -0,0 +1,28 @@
+name: databases
+kind: stratum
+description: some popular databases
+build-depends:
+- morph: tools
+- morph: nfs
+chunks:
+- name: readline
+ repo: upstream:readline
+ ref: 7628b745a813aac53586b640da056a975f1c443e
+ unpetrify-ref: readline-6.3
+ build-depends: []
+- name: postgresql
+ repo: upstream:postgresql
+ ref: d4f8dde3c1c2c90c723ab550e7f449fc75599316
+ unpetrify-ref: REL9_3_4
+ build-depends:
+ - readline
+- name: redis
+ repo: upstream:redis
+ ref: 0682f8698e8ac815ca06a81e448d5f8785d5aaea
+ unpetrify-ref: baserock/ps/proto-web-system
+ build-depends: []
+- name: memcached
+ repo: upstream:memcached
+ ref: d8b1047620a54443f6bdca7f0dc5ee3b4d99378e
+ unpetrify-ref: master
+ build-depends: []
diff --git a/erlang-things.morph b/erlang-things.morph
new file mode 100644
index 00000000..dfda4772
--- /dev/null
+++ b/erlang-things.morph
@@ -0,0 +1,17 @@
+name: erlang-things
+kind: stratum
+description: erlang/otp and things
+build-depends:
+- morph: tools
+chunks:
+- name: erlang
+ repo: upstream:erlang
+ ref: 63ba4f02614a7938f686484b872da246f0a0b5c6
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: rabbitmq-server
+ repo: file:///src2/ws-sunday/baserock/ps/proto-web-system/upstream/rabbitmq-server
+ ref: b200726e16673d20c8dbdffac85c897431378017
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - erlang
diff --git a/gtk2.morph b/gtk2.morph
index 74156fcd..152e78a5 100644
--- a/gtk2.morph
+++ b/gtk2.morph
@@ -58,8 +58,8 @@ chunks:
build-depends: []
- name: colm
repo: upstream:colm
- ref: fc633086748169632e93b945259197ba46f27695
- unpetrify-ref: master
+ ref: 746b80d9b15dceca54dff43123d56ffcb6e42f06
+ unpetrify-ref: 0.11.1
build-depends: []
- name: ragel
repo: upstream:ragel
diff --git a/useful.morph b/useful.morph
new file mode 100644
index 00000000..70b7d87d
--- /dev/null
+++ b/useful.morph
@@ -0,0 +1,59 @@
+name: useful
+kind: stratum
+description: pip, node, ruby - can use their package managers from here...
+build-depends:
+- morph: tools
+chunks:
+- name: icu
+ repo: upstream:icu
+ ref: ba023548a3bff7277cbea4acade3042ce9d8949e
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: libgit2
+ repo: upstream:libgit2
+ ref: 4b0a36e881506a02b43a4ae3c19c93c919b36eeb
+ unpetrify-ref: master
+ build-depends: []
+- name: tar
+ repo: upstream:tar
+ ref: 0492b656656ca7973b126b8c117804d80952de48
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: pip
+ repo: upstream:pip.git
+ ref: d4b691b743a91500cf49119d28a805db8313f129
+ unpetrify-ref: master
+ build-depends: []
+- name: node
+ repo: upstream:node.git
+ ref: cc56c62ed879ad4f93b1fdab3235c43e60f48b7e
+ unpetrify-ref: v0.10.26
+ build-depends: []
+- name: ruby-1.8
+ repo: upstream:ruby
+ ref: 7a24f1710028d568ad61d0aa49d5178260178d77
+ unpetrify-ref: baserock/morph/ruby_1_8_7
+ build-depends: []
+- name: libyaml
+ repo: upstream:libyaml-hg
+ ref: 0577078d6625a7bf06e6bc7fb26a43e27400b17e
+ unpetrify-ref: master
+ build-depends: []
+- name: ruby-1.9
+ repo: upstream:ruby
+ ref: 6ecf40e1fa1b2c55f63d0ccb46bce2fca73b40ad
+ unpetrify-ref: baserock/ps/proto-web-system
+ build-depends:
+ - ruby-1.8
+ - libyaml
+- name: pcre
+ repo: upstream:pcre
+ ref: 2720152c58e13e7cc7403642ec33127101b9971b
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: nginx
+ repo: upstream:nginx
+ ref: 7a8cd938c2c573a382568055e17e2a397c508b68
+ unpetrify-ref: master
+ build-depends:
+ - pcre
diff --git a/vboxdeploy.morph b/vboxdeploy.morph
new file mode 100644
index 00000000..46f89a65
--- /dev/null
+++ b/vboxdeploy.morph
@@ -0,0 +1,14 @@
+name: vboxdeploy
+kind: cluster
+systems:
+- morph: web-system
+ repo: baserock:baserock/definitions
+ ref: proto-web
+ deploy:
+ my-toy:
+ type: virtualbox-ssh
+ location: vbox+ssh://paulsherwood@192.168.56.1/web-system/Users/paulsherwood/web-system.vdi
+ DISK_SIZE: 4G
+ HOST_IPADDR: 192.168.56.1
+ NETMASK: 255.255.255.0
+ NETWORK_CONFIG: lo:loopback;eth0:static,address=192.168.56.96,netmask=255.255.255.0;eth1:dhcp,hostname=$(hostname)
diff --git a/web-system.morph b/web-system.morph
new file mode 100644
index 00000000..adcabac4
--- /dev/null
+++ b/web-system.morph
@@ -0,0 +1,20 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: system with web tools
+kind: system
+name: web-system
+strata:
+- morph: build-essential
+- morph: bsp-x86_64-generic
+- morph: foundation
+- morph: core
+- morph: tools
+- morph: nfs
+- morph: databases
+- morph: useful
+- morph: erlang-things