From 5048543c141b21b473549937b258fd87b4f5c895 Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Wed, 18 Mar 2015 14:04:20 +0000 Subject: Morph build d01764755a4e43338526d28d1cf90012 System branch: master --- clusters/gitlab-ci-runner-cluster.morph | 16 -- clusters/gitlab-cluster.morph | 48 ---- clusters/gitlab-server-cluster.morph | 22 -- gitlab-ci-runner/manifest | 4 - .../usr/share/gitlab-install/install-runner | 36 --- .../systemd-units/gitlab-ci-runner.service | 15 -- gitlab-server/manifest | 37 --- .../usr/share/gitlab-install/backup-gitlab | 16 -- .../gitlab-ci/config/application.yml | 43 ---- .../gitlab-install/gitlab-ci/config/resque.yml | 3 - .../gitlab-install/gitlab-ci/config/unicorn.rb | 102 -------- .../gitlab-ci/lib/support/nginx/gitlab_ci | 36 --- .../share/gitlab-install/gitlab-remote-backup.sh | 22 -- .../share/gitlab-install/gitlab-remote-restore.sh | 57 ----- .../share/gitlab-install/gitlab-shell/config.yml | 41 ---- .../gitlab-install/gitlab/config/database.yml | 49 ---- .../share/gitlab-install/gitlab/config/gitlab.yml | 270 --------------------- .../gitlab/config/initializers/rack_attack.rb | 18 -- .../share/gitlab-install/gitlab/config/resque.yml | 3 - .../share/gitlab-install/gitlab/config/unicorn.rb | 113 --------- .../gitlab-install/gitlab/lib/support/nginx/gitlab | 70 ------ gitlab-server/usr/share/gitlab-install/nginx.conf | 73 ------ .../systemd-units/gitlab-backup.service | 11 - .../systemd-units/gitlab-backup.timer | 8 - .../systemd-units/gitlab-ci-sidekiq.service | 24 -- .../systemd-units/gitlab-ci-unicorn.service | 24 -- .../systemd-units/gitlab-sidekiq.service | 24 -- .../systemd-units/gitlab-unicorn.service | 24 -- .../gitlab-install/systemd-units/gitlab.target | 15 -- .../gitlab-install/systemd-units/nginx.service | 15 -- .../gitlab-install/systemd-units/postgres.service | 25 -- .../gitlab-install/systemd-units/redis.service | 13 - gitlab-server/usr/share/gitlab-setup | 104 -------- gitlab.configure | 128 ---------- scripts/licensecheck.sh | 1 + strata/ansible.morph | 2 +- strata/baserock-import.morph | 1 + strata/build-essential/fhs-dirs.morph | 1 - strata/build-essential/glibc.morph | 8 + strata/build-essential/stage2-fhs-dirs.morph | 1 - strata/build-essential/stage2-glibc.morph | 9 + strata/core.morph | 9 + strata/foundation.morph | 9 +- strata/foundation/rsync.morph | 9 + strata/genivi.morph | 2 +- strata/gitlab.morph | 21 -- strata/gitlab/gitlab-ce.morph | 6 - strata/gitlab/gitlab-ci.morph | 6 - strata/gitlab/gitlab-shell.morph | 6 - strata/lorry-controller.morph | 5 +- strata/lorry.morph | 3 +- strata/morph-utils.morph | 36 +-- strata/morph-utils/python-coveragepy.morph | 6 - strata/python-cliapp.morph | 24 ++ strata/python-cliapp/python-coveragepy.morph | 6 + strata/python-core.morph | 10 + strata/python-wsgi.morph | 15 ++ strata/tools.morph | 5 - strata/tools/rsync.morph | 9 - strata/virtualization.morph | 12 +- strip-gplv3.configure | 1 + systems/build-system-armv7lhf-highbank.morph | 4 + systems/build-system-armv7lhf-jetson.morph | 4 + systems/build-system-armv8l64.morph | 4 + systems/build-system-ppc64.morph | 4 + systems/build-system-x86_32-chroot.morph | 4 + systems/build-system-x86_32.morph | 4 + systems/build-system-x86_64-chroot.morph | 4 + systems/build-system-x86_64.morph | 4 + systems/ceph-service-x86_64-generic.morph | 4 + .../cross-bootstrap-system-armv7lhf-generic.morph | 2 + .../cross-bootstrap-system-armv8l64-generic.morph | 2 + systems/cross-bootstrap-system-ppc64-generic.morph | 2 + .../cross-bootstrap-system-x86_64-generic.morph | 2 + systems/devel-system-armv7-chroot.morph | 4 + systems/devel-system-armv7-highbank.morph | 4 + systems/devel-system-armv7-versatile.morph | 4 + systems/devel-system-armv7-wandboard.morph | 4 + systems/devel-system-armv7b-chroot.morph | 4 + systems/devel-system-armv7b-highbank.morph | 4 + systems/devel-system-armv7lhf-chroot.morph | 4 + systems/devel-system-armv7lhf-highbank.morph | 4 + systems/devel-system-armv7lhf-jetson.morph | 4 + systems/devel-system-armv7lhf-wandboard.morph | 4 + systems/devel-system-armv8l64.morph | 4 + systems/devel-system-ppc64-chroot.morph | 4 + systems/devel-system-ppc64-generic.morph | 4 + systems/devel-system-x86_32-chroot.morph | 4 + systems/devel-system-x86_32-generic.morph | 4 + systems/devel-system-x86_64-chroot.morph | 4 + systems/devel-system-x86_64-generic.morph | 4 + systems/devel-system-x86_64-vagrant.morph | 4 + systems/gitlab-ci-runner.morph | 58 ----- systems/gitlab-server.morph | 34 --- systems/installer-system-x86_64.morph | 4 + systems/trove-system-x86_64.morph | 4 + systems/xfce-system.morph | 4 + 97 files changed, 237 insertions(+), 1715 deletions(-) delete mode 100644 clusters/gitlab-ci-runner-cluster.morph delete mode 100644 clusters/gitlab-cluster.morph delete mode 100644 clusters/gitlab-server-cluster.morph delete mode 100644 gitlab-ci-runner/manifest delete mode 100755 gitlab-ci-runner/usr/share/gitlab-install/install-runner delete mode 100644 gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service delete mode 100644 gitlab-server/manifest delete mode 100644 gitlab-server/usr/share/gitlab-install/backup-gitlab delete mode 100644 gitlab-server/usr/share/gitlab-install/gitlab-ci/config/application.yml delete mode 100644 gitlab-server/usr/share/gitlab-install/gitlab-ci/config/resque.yml delete mode 100644 gitlab-server/usr/share/gitlab-install/gitlab-ci/config/unicorn.rb delete mode 100644 gitlab-server/usr/share/gitlab-install/gitlab-ci/lib/support/nginx/gitlab_ci delete mode 100644 gitlab-server/usr/share/gitlab-install/gitlab-remote-backup.sh delete mode 100644 gitlab-server/usr/share/gitlab-install/gitlab-remote-restore.sh delete mode 100644 gitlab-server/usr/share/gitlab-install/gitlab-shell/config.yml delete mode 100644 gitlab-server/usr/share/gitlab-install/gitlab/config/database.yml delete mode 100644 gitlab-server/usr/share/gitlab-install/gitlab/config/gitlab.yml delete mode 100644 gitlab-server/usr/share/gitlab-install/gitlab/config/initializers/rack_attack.rb delete mode 100644 gitlab-server/usr/share/gitlab-install/gitlab/config/resque.yml delete mode 100644 gitlab-server/usr/share/gitlab-install/gitlab/config/unicorn.rb delete mode 100644 gitlab-server/usr/share/gitlab-install/gitlab/lib/support/nginx/gitlab delete mode 100644 gitlab-server/usr/share/gitlab-install/nginx.conf delete mode 100644 gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-backup.service delete mode 100644 gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-backup.timer delete mode 100644 gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-sidekiq.service delete mode 100644 gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service delete mode 100644 gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-sidekiq.service delete mode 100644 gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service delete mode 100644 gitlab-server/usr/share/gitlab-install/systemd-units/gitlab.target delete mode 100644 gitlab-server/usr/share/gitlab-install/systemd-units/nginx.service delete mode 100644 gitlab-server/usr/share/gitlab-install/systemd-units/postgres.service delete mode 100644 gitlab-server/usr/share/gitlab-install/systemd-units/redis.service delete mode 100755 gitlab-server/usr/share/gitlab-setup delete mode 100644 gitlab.configure create mode 100644 strata/foundation/rsync.morph delete mode 100644 strata/gitlab.morph delete mode 100644 strata/gitlab/gitlab-ce.morph delete mode 100644 strata/gitlab/gitlab-ci.morph delete mode 100644 strata/gitlab/gitlab-shell.morph delete mode 100644 strata/morph-utils/python-coveragepy.morph create mode 100644 strata/python-cliapp.morph create mode 100644 strata/python-cliapp/python-coveragepy.morph create mode 100644 strata/python-wsgi.morph delete mode 100644 strata/tools/rsync.morph delete mode 100644 systems/gitlab-ci-runner.morph delete mode 100644 systems/gitlab-server.morph diff --git a/clusters/gitlab-ci-runner-cluster.morph b/clusters/gitlab-ci-runner-cluster.morph deleted file mode 100644 index 97da4a8d..00000000 --- a/clusters/gitlab-ci-runner-cluster.morph +++ /dev/null @@ -1,16 +0,0 @@ -name: gitlab-ci-runner-cluster -kind: cluster -systems: -- morph: systems/gitlab-ci-runner.morph - deploy-defaults: - AUTOSTART: false - DISK_SIZE: 6G - RAM_SIZE: 3G - VCPUS: 2 - VERSION_LABEL: factory - deploy: - gitlab-ci-runner: - type: kvm - location: kvm+ssh://USER@HOST/gitlab-ci-runner/home/USER/gitlab-ci-runner.img - HOSTNAME: gitlab-ci-runner - INSTALL_FILES: gitlab-ci-runner/manifest diff --git a/clusters/gitlab-cluster.morph b/clusters/gitlab-cluster.morph deleted file mode 100644 index 5f3177ca..00000000 --- a/clusters/gitlab-cluster.morph +++ /dev/null @@ -1,48 +0,0 @@ -name: gitlab-cluster -kind: cluster -description: | - This is an example cluster morphology that can be adapted to set up a GitLab - server with GitLab CI running alongside it, along with one or more CI - runners to actually run the CI tests/builds. - - For the server, you will need to specify the GITLAB_HOSTNAME. This is the - domain name or IP by which your deployed GitLab instance will be able to be - reached by. You will also need a GITLAB_PORT, CI_PORT, UNICORN PORT and - UNICORN_CI_PORT. These are the port to use for GitLab, the port to use for - GitLab CI, the port for GitLab's Unicorn process to listen on, and the port - for GitLab CI's Unicorn process to listen on respectively. Finally, you will - need to define a GITLAB_EMAIL, that is the email that mail from your GitLab - instance will appear to be from. -systems: -- morph: systems/gitlab-server.morph - deploy-defaults: - AUTOSTART: false - DISK_SIZE: 10G - RAM_SIZE: 2G - VCPUS: 2 - VERSION_LABEL: factory - deploy: - gitlab: - type: kvm - location: kvm+ssh://USER@HOST/gitlab/home/USER/gitlab.img - CI_PORT: 81 - GITLAB_EMAIL: gitlab@gitlab.example.com - GITLAB_HOSTNAME: gitlab.example.com - GITLAB_PORT: 80 - HOSTNAME: gitlab - INSTALL_FILES: gitlab-server/manifest - UNICORN_CI_PORT: 8081 - UNICORN_PORT: 8080 -- morph: systems/gitlab-ci-runner.morph - deploy-defaults: - AUTOSTART: false - DISK_SIZE: 10G - RAM_SIZE: 3G - VCPUS: 2 - VERSION_LABEL: factory - deploy: - gitlab-ci-runner: - type: kvm - location: kvm+ssh://USER@HOST/gitlab-ci-runner/home/USER/gitlab-ci-runner.img - HOSTNAME: gitlab-ci-runner - INSTALL_FILES: gitlab-ci-runner/manifest diff --git a/clusters/gitlab-server-cluster.morph b/clusters/gitlab-server-cluster.morph deleted file mode 100644 index fcb7c1d2..00000000 --- a/clusters/gitlab-server-cluster.morph +++ /dev/null @@ -1,22 +0,0 @@ -name: gitlab-server-cluster -kind: cluster -systems: -- morph: systems/gitlab-server.morph - deploy-defaults: - AUTOSTART: false - DISK_SIZE: 6G - RAM_SIZE: 2G - VCPUS: 2 - VERSION_LABEL: factory - deploy: - gitlab: - type: kvm - location: kvm+ssh://USER@HOST/gitlab/home/USER/gitlab.img - CI_PORT: 81 - GITLAB_EMAIL: gitlab@gitlab.example.com - GITLAB_HOSTNAME: gitlab.example.com - GITLAB_PORT: 80 - HOSTNAME: gitlab - INSTALL_FILES: gitlab-server/manifest - UNICORN_CI_PORT: 8081 - UNICORN_PORT: 8080 diff --git a/gitlab-ci-runner/manifest b/gitlab-ci-runner/manifest deleted file mode 100644 index bad84dea..00000000 --- a/gitlab-ci-runner/manifest +++ /dev/null @@ -1,4 +0,0 @@ -0040755 0 0 /usr/share/gitlab-install -0100755 0 0 /usr/share/gitlab-install/install-runner -0040755 0 0 /usr/share/gitlab-install/systemd-units -0100644 0 0 /usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service diff --git a/gitlab-ci-runner/usr/share/gitlab-install/install-runner b/gitlab-ci-runner/usr/share/gitlab-install/install-runner deleted file mode 100755 index f1165af8..00000000 --- a/gitlab-ci-runner/usr/share/gitlab-install/install-runner +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2014 Codethink Limited -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -set -e - -gem install bundler - -git config --global http.sslVerify false -git config --global user.name 'GitLab CI Runner' -git config --global user.email 'ci_runner@localhost' -git config --global core.autocrlf input - -git clone https://gitlab.com/gitlab-org/gitlab-ci-runner.git -b 5-0-stable -cd gitlab-ci-runner - -bundle install --deployment -bundle exec ./bin/setup -nohup bundle exec ./bin/runner & - -cd /etc/systemd/system -cp /usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service . -systemctl enable gitlab-ci-runner.service diff --git a/gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service b/gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service deleted file mode 100644 index dfc84d96..00000000 --- a/gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=GitLab CI Runner - -[Service] -User=root -WorkingDirectory=/root/gitlab-ci-runner -SyslogIdentifier=gitlab-ci-runner - -ExecStart=/usr/bin/bundle exec "./bin/runner" -ExecStop=/bin/kill -s QUIT $MAINPID -ExecReload=/bin/kill -s USR2 $MAINPID - -[Install] -WantedBy=multi-user.target - diff --git a/gitlab-server/manifest b/gitlab-server/manifest deleted file mode 100644 index 7ac74744..00000000 --- a/gitlab-server/manifest +++ /dev/null @@ -1,37 +0,0 @@ -0100755 0 0 /usr/share/gitlab-setup -0040755 0 0 /usr/share/gitlab-install -0100755 0 0 /usr/share/gitlab-install/backup-gitlab -0040755 0 0 /usr/share/gitlab-install/gitlab -0040755 0 0 /usr/share/gitlab-install/gitlab/config -0100644 0 0 /usr/share/gitlab-install/gitlab/config/gitlab.yml -0040755 0 0 /usr/share/gitlab-install/gitlab/config/initializers -0100644 0 0 /usr/share/gitlab-install/gitlab/config/resque.yml -0100644 0 0 /usr/share/gitlab-install/gitlab/config/unicorn.rb -0100644 0 0 /usr/share/gitlab-install/gitlab/config/initializers/rack_attack.rb -0040755 0 0 /usr/share/gitlab-install/gitlab/lib -0040755 0 0 /usr/share/gitlab-install/gitlab/lib/support -0040755 0 0 /usr/share/gitlab-install/gitlab/lib/support/nginx -0100644 0 0 /usr/share/gitlab-install/gitlab/lib/support/nginx/gitlab -0040755 0 0 /usr/share/gitlab-install/gitlab-shell -0100644 0 0 /usr/share/gitlab-install/gitlab-shell/config.yml -0040755 0 0 /usr/share/gitlab-install/gitlab-ci -0040755 0 0 /usr/share/gitlab-install/gitlab-ci/config -0100644 0 0 /usr/share/gitlab-install/gitlab-ci/config/application.yml -0100644 0 0 /usr/share/gitlab-install/gitlab-ci/config/resque.yml -0100644 0 0 /usr/share/gitlab-install/gitlab-ci/config/unicorn.rb -0040755 0 0 /usr/share/gitlab-install/gitlab-ci/lib -0040755 0 0 /usr/share/gitlab-install/gitlab-ci/lib/support -0040755 0 0 /usr/share/gitlab-install/gitlab-ci/lib/support/nginx -0100644 0 0 /usr/share/gitlab-install/gitlab-ci/lib/support/nginx/gitlab_ci -0100644 0 0 /usr/share/gitlab-install/nginx.conf -0040755 0 0 /usr/share/gitlab-install/systemd-units -0100644 0 0 /usr/share/gitlab-install/systemd-units/gitlab.target -0100644 0 0 /usr/share/gitlab-install/systemd-units/gitlab-ci-sidekiq.service -0100644 0 0 /usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service -0100644 0 0 /usr/share/gitlab-install/systemd-units/gitlab-sidekiq.service -0100644 0 0 /usr/share/gitlab-install/systemd-units/gitlab-unicorn.service -0100644 0 0 /usr/share/gitlab-install/systemd-units/nginx.service -0100644 0 0 /usr/share/gitlab-install/systemd-units/postgres.service -0100644 0 0 /usr/share/gitlab-install/systemd-units/redis.service -0100644 0 0 /usr/share/gitlab-install/systemd-units/gitlab-backup.service -0100644 0 0 /usr/share/gitlab-install/systemd-units/gitlab-backup.timer diff --git a/gitlab-server/usr/share/gitlab-install/backup-gitlab b/gitlab-server/usr/share/gitlab-install/backup-gitlab deleted file mode 100644 index 1320df81..00000000 --- a/gitlab-server/usr/share/gitlab-install/backup-gitlab +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# Run the gitlab backup script. The backup will be stored as -# /home/git/gitlab-backup.tar . A separate backup host will need to -# back that up. -# -# This script be run as the postgres user on a Baserock GitLab host. - -set -e - -export PATH=/usr/local/bin:/usr/bin:/bin - -mkdir -p /home/postgres/dumps -cd /home/postgres/dumps -pg_dumpall > new.dump -mv new.dump gitlab.pg_dumpall diff --git a/gitlab-server/usr/share/gitlab-install/gitlab-ci/config/application.yml b/gitlab-server/usr/share/gitlab-install/gitlab-ci/config/application.yml deleted file mode 100644 index 6eb5eb19..00000000 --- a/gitlab-server/usr/share/gitlab-install/gitlab-ci/config/application.yml +++ /dev/null @@ -1,43 +0,0 @@ -defaults: &defaults - gitlab_server_urls: - # Replace with your gitlab server url - - 'http://##GITLAB_HOSTNAME##/' - - ## Gitlab CI settings - gitlab_ci: - ## Web server settings - host: ##GITLAB_HOSTNAME## - port: ##CI_PORT## - https: false - - ## Email settings - # Email address used in the "From" field in mails sent by GitLab-CI - email_from: gitlab-ci@localhost - - # Email address of your support contact (default: same as email_from) - support_email: support@localhost - - # Default project notifications settings: - # - # Send emails only on broken builds (default: true) - # all_broken_builds: true - # - # Add committer to recipients list (default: false) - # add_committer: true - - gravatar: - enabled: true - plain_url: "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm" - ssl_url: "https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm" - - -development: - <<: *defaults - -test: - <<: *defaults - gitlab_server_urls: - - 'http://demo.gitlab.com/' - -production: - <<: *defaults diff --git a/gitlab-server/usr/share/gitlab-install/gitlab-ci/config/resque.yml b/gitlab-server/usr/share/gitlab-install/gitlab-ci/config/resque.yml deleted file mode 100644 index f42ffe78..00000000 --- a/gitlab-server/usr/share/gitlab-install/gitlab-ci/config/resque.yml +++ /dev/null @@ -1,3 +0,0 @@ -development: redis://127.0.0.1:6379 -test: redis://127.0.0.1:6379 -production: redis://127.0.0.1:6379 diff --git a/gitlab-server/usr/share/gitlab-install/gitlab-ci/config/unicorn.rb b/gitlab-server/usr/share/gitlab-install/gitlab-ci/config/unicorn.rb deleted file mode 100644 index cdcbe39a..00000000 --- a/gitlab-server/usr/share/gitlab-install/gitlab-ci/config/unicorn.rb +++ /dev/null @@ -1,102 +0,0 @@ -# Sample verbose configuration file for Unicorn (not Rack) -# -# This configuration file documents many features of Unicorn -# that may not be needed for some applications. See -# http://unicorn.bogomips.org/examples/unicorn.conf.minimal.rb -# for a much simpler configuration file. -# -# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete -# documentation. - -# Use at least one worker per core if you're on a dedicated server, -# more will usually help for _short_ waits on databases/caches. -worker_processes 2 - -# Since Unicorn is never exposed to outside clients, it does not need to -# run on the standard HTTP port (80), there is no reason to start Unicorn -# as root unless it's from system init scripts. -# If running the master process as root and the workers as an unprivileged -# user, do this to switch euid/egid in the workers (also chowns logs): -# user "unprivileged_user", "unprivileged_group" - -# Help ensure your application will always spawn in the symlinked -# "current" directory that Capistrano sets up. -working_directory "/home/gitlab_ci/gitlab-ci" # available in 0.94.0+ - -# listen on both a Unix domain socket and a TCP port, -# we use a shorter backlog for quicker failover when busy -listen "/home/gitlab_ci/gitlab-ci/tmp/sockets/gitlab-ci.socket", :backlog => 64 -listen "127.0.0.1:##UNICORN_CI_PORT##", :tcp_nopush => true - -# nuke workers after 30 seconds instead of 60 seconds (the default) -timeout 30 - -# feel free to point this anywhere accessible on the filesystem -pid "/home/gitlab_ci/gitlab-ci/tmp/pids/unicorn.pid" - -# By default, the Unicorn logger will write to stderr. -# Additionally, some applications/frameworks log to stderr or stdout, -# so prevent them from going to /dev/null when daemonized here: -stderr_path "/home/gitlab_ci/gitlab-ci/log/unicorn.stderr.log" -stdout_path "/home/gitlab_ci/gitlab-ci/log/unicorn.stdout.log" - -# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings -# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow -preload_app true -GC.respond_to?(:copy_on_write_friendly=) and - GC.copy_on_write_friendly = true - -# Enable this flag to have unicorn test client connections by writing the -# beginning of the HTTP headers before calling the application. This -# prevents calling the application for connections that have disconnected -# while queued. This is only guaranteed to detect clients on the same -# host unicorn runs on, and unlikely to detect disconnects even on a -# fast LAN. -check_client_connection false - -before_fork do |server, worker| - # the following is highly recomended for Rails + "preload_app true" - # as there's no need for the master process to hold a connection - defined?(ActiveRecord::Base) and - ActiveRecord::Base.connection.disconnect! - - # The following is only recommended for memory/DB-constrained - # installations. It is not needed if your system can house - # twice as many worker_processes as you have configured. - # - # This allows a new master process to incrementally - # phase out the old master process with SIGTTOU to avoid a - # thundering herd (especially in the "preload_app false" case) - # when doing a transparent upgrade. The last worker spawned - # will then kill off the old master process with a SIGQUIT. - old_pid = "#{server.config[:pid]}.oldbin" - if old_pid != server.pid - begin - sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU - Process.kill(sig, File.read(old_pid).to_i) - rescue Errno::ENOENT, Errno::ESRCH - end - end - # - # Throttle the master from forking too quickly by sleeping. Due - # to the implementation of standard Unix signal handlers, this - # helps (but does not completely) prevent identical, repeated signals - # from being lost when the receiving process is busy. - # sleep 1 -end - -after_fork do |server, worker| - # per-process listener ports for debugging/admin/migrations - # addr = "127.0.0.1:#{9293 + worker.nr}" - # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true) - - # the following is *required* for Rails + "preload_app true", - defined?(ActiveRecord::Base) and - ActiveRecord::Base.establish_connection - - # if preload_app is true, then you may also want to check and - # restart any other shared sockets/descriptors such as Memcached, - # and Redis. TokyoCabinet file handles are safe to reuse - # between any number of forked children (assuming your kernel - # correctly implements pread()/pwrite() system calls) -end diff --git a/gitlab-server/usr/share/gitlab-install/gitlab-ci/lib/support/nginx/gitlab_ci b/gitlab-server/usr/share/gitlab-install/gitlab-ci/lib/support/nginx/gitlab_ci deleted file mode 100644 index aa26614c..00000000 --- a/gitlab-server/usr/share/gitlab-install/gitlab-ci/lib/support/nginx/gitlab_ci +++ /dev/null @@ -1,36 +0,0 @@ -# GITLAB CI -# Maintainer: @randx -# App Version: 2.0 - -upstream gitlab_ci { - server unix:/home/gitlab_ci/gitlab-ci/tmp/sockets/gitlab-ci.socket; -} - -server { - listen 81 default_server; # e.g., listen 192.168.1.1:80; - server_name ct-gitlab.dyn.ducie.codethink.co.uk; # e.g., server_name source.example.com; - root /home/gitlab_ci/gitlab-ci/public; - - access_log /var/log/nginx/gitlab_ci_access.log; - error_log /var/log/nginx/gitlab_ci_error.log; - - location / { - try_files $uri $uri/index.html $uri.html @gitlab_ci; - } - - location @gitlab_ci { - proxy_read_timeout 300; - proxy_connect_timeout 300; - proxy_redirect off; - - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - - proxy_pass http://gitlab_ci; - } - - # adjust this to match the largest build log your runners might submit, - # set to 0 to disable limit - client_max_body_size 10m; -} diff --git a/gitlab-server/usr/share/gitlab-install/gitlab-remote-backup.sh b/gitlab-server/usr/share/gitlab-install/gitlab-remote-backup.sh deleted file mode 100644 index 85618811..00000000 --- a/gitlab-server/usr/share/gitlab-install/gitlab-remote-backup.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# Copy relevant files of a Baserock Gitlab instance out of the instance. -# -# Usage: backup.sh ADDR -# where ADDR is the address (domain name, IP address) of the instance. -# The files are copied to the current directory. - -set -eux - -ADDR="$1" - -backup() -{ - rsync -ahHS --delete "root@$ADDR:$1" "$2" -} - -mkdir -p dumps repositories uploads -backup /home/postgres/dumps/. dumps/. -backup /home/git/repositories/. repositories/. -backup /home/git/gitlab/public/uploads/. uploads/. - diff --git a/gitlab-server/usr/share/gitlab-install/gitlab-remote-restore.sh b/gitlab-server/usr/share/gitlab-install/gitlab-remote-restore.sh deleted file mode 100644 index 78ff691a..00000000 --- a/gitlab-server/usr/share/gitlab-install/gitlab-remote-restore.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# Restore a Baserock Gitlab system backup to a fresh instance. -# -# Usage: restore.sh ADDR -# where ADDR is the address (domain name, IP address) of the instance. -# -# What this does is a) stop services b) copy files over c) reset the Postgres -# databases. - -set -eux - -ADDR="$1" - -restore() -{ - rsync -ahHS --delete "$2" "root@$ADDR:$1" -} - -# Stop services so we don't modify files and databases from underneath -# them, and also so they don't modify things while restore is happening. - -ssh "root@$ADDR" systemctl stop \ - crond gitlab-backup.service \ - gitlab-ci-sidekiq.service \ - gitlab-ci-unicorn.service \ - gitlab-sidekiq.service \ - gitlab-unicorn.service \ - gitlab.target \ - gitlab-backup.timer \ - nginx.service \ - redis.service - -# Create the directory where postgres dump files go. - -ssh "root@$ADDR" install -d -o postgres -g postgres /home/postgres/dumps - -# Restore the various files. - -restore /home/postgres/dumps/. dumps/. -restore /home/git/repositories/. repositories/. -restore /home/git/gitlab/public/uploads/. uploads/. - -# And thier uid/gid -ssh "root@$ADDR" chown -R git:git /home/git/repositories /home/git/gitlab/public/uploads - -# Delete tables and roles from Postgres so that the restore can happen. - -ssh "root@$ADDR" sudo -u postgres psql < host with your domain -# 3. Replace gitlab -> email_from - -production: &base - # - # 1. GitLab app settings - # ========================== - - ## GitLab settings - gitlab: - ## Web server settings (note: host is the FQDN, do not include http://) - host: ##GITLAB_HOSTNAME## - port: ##GITLAB_PORT## - https: false - - # Uncomment and customize the last line to run in a non-root path - # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. - # Note that four settings need to be changed for this to work. - # 1) In your application.rb file: config.relative_url_root = "/gitlab" - # 2) In your gitlab.yml file: relative_url_root: /gitlab - # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab" - # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab" - # To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production - # - # relative_url_root: /gitlab - - # Uncomment and customize if you can't use the default user to run GitLab (default: 'git') - # user: git - - ## Email settings - # Email address used in the "From" field in mails sent by GitLab - email_from: ##GITLAB_EMAIL## - - # Email address of your support contact (default: same as email_from) - support_email: ##GITLAB_EMAIL## - - ## User settings - default_projects_limit: 10 - # default_can_create_group: false # default: true - # username_changing_enabled: false # default: true - User can change her username/namespace - ## Default theme - ## BASIC = 1 - ## MARS = 2 - ## MODERN = 3 - ## GRAY = 4 - ## COLOR = 5 - # default_theme: 2 # default: 2 - - - ## Users management - # default: false - Account passwords are not sent via the email if signup is enabled. - # signup_enabled: true - # - # default: true - If set to false, standard login form won't be shown on the sign-in page - # signin_enabled: false - - - # Restrict setting visibility levels for non-admin users. - # The default is to allow all levels. - #restricted_visibility_levels: [ "public" ] - - ## Automatic issue closing - # If a commit message matches this regular expression, all issues referenced from the matched text will be closed. - # This happens when the commit is pushed or merged into the default branch of a project. - # When not specified the default issue_closing_pattern as specified below will be used. - # issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)' - - ## Default project features settings - default_projects_features: - issues: true - merge_requests: true - wiki: true - wall: false - snippets: false - visibility_level: "private" # can be "private" | "internal" | "public" - - ## Repository downloads directory - # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory. - # The default is 'tmp/repositories' relative to the root of the Rails app. - # repository_downloads_path: tmp/repositories - - ## External issues trackers - issues_tracker: - # redmine: - # title: "Redmine" - # ## If not nil, link 'Issues' on project page will be replaced with this - # ## Use placeholders: - # ## :project_id - GitLab project identifier - # ## :issues_tracker_id - Project Name or Id in external issue tracker - # project_url: "http://redmine.sample/projects/:issues_tracker_id" - # - # ## If not nil, links from /#\d/ entities from commit messages will replaced with this - # ## Use placeholders: - # ## :project_id - GitLab project identifier - # ## :issues_tracker_id - Project Name or Id in external issue tracker - # ## :id - Issue id (from commit messages) - # issues_url: "http://redmine.sample/issues/:id" - # - # ## If not nil, linkis to creating new issues will be replaced with this - # ## Use placeholders: - # ## :project_id - GitLab project identifier - # ## :issues_tracker_id - Project Name or Id in external issue tracker - # new_issue_url: "http://redmine.sample/projects/:issues_tracker_id/issues/new" - # - # jira: - # title: "Atlassian Jira" - # project_url: "http://jira.sample/issues/?jql=project=:issues_tracker_id" - # issues_url: "http://jira.sample/browse/:id" - # new_issue_url: "http://jira.sample/secure/CreateIssue.jspa" - - ## Gravatar - gravatar: - enabled: true # Use user avatar image from Gravatar.com (default: true) - # plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm - # ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm - - # - # 2. Auth settings - # ========================== - - ## LDAP settings - # You can inspect a sample of the LDAP users with login access by running: - # bundle exec rake gitlab:ldap:check RAILS_ENV=production - ldap: - enabled: false - host: '_your_ldap_server' - port: 636 - uid: 'sAMAccountName' - method: 'ssl' # "tls" or "ssl" or "plain" - bind_dn: '_the_full_dn_of_the_user_you_will_bind_with' - password: '_the_password_of_the_bind_user' - # If allow_username_or_email_login is enabled, GitLab will ignore everything - # after the first '@' in the LDAP username submitted by the user on login. - # - # Example: - # - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials; - # - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'. - # - # If you are using "uid: 'userPrincipalName'" on ActiveDirectory you need to - # disable this setting, because the userPrincipalName contains an '@'. - allow_username_or_email_login: true - - # Base where we can search for users - # - # Ex. ou=People,dc=gitlab,dc=example - # - base: '' - - # Filter LDAP users - # - # Format: RFC 4515 - # Ex. (employeeType=developer) - # - user_filter: '' - - - ## OmniAuth settings - omniauth: - # Allow login via Twitter, Google, etc. using OmniAuth providers - enabled: false - - # CAUTION! - # This allows users to login without having a user account first (default: false). - # User accounts will be created automatically when authentication was successful. - allow_single_sign_on: false - # Locks down those users until they have been cleared by the admin (default: true). - block_auto_created_users: true - - ## Auth providers - # Uncomment the following lines and fill in the data of the auth provider you want to use - # If your favorite auth provider is not listed you can use others: - # see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Custom-omniauth-provider-configurations - # The 'app_id' and 'app_secret' parameters are always passed as the first two - # arguments, followed by optional 'args' which can be either a hash or an array. - # Documentation for this is available at http://doc.gitlab.com/ce/integration/omniauth.html - providers: - # - { name: 'google_oauth2', app_id: 'YOUR APP ID', - # app_secret: 'YOUR APP SECRET', - # args: { access_type: 'offline', approval_prompt: '' } } - # - { name: 'twitter', app_id: 'YOUR APP ID', - # app_secret: 'YOUR APP SECRET'} - # - { name: 'github', app_id: 'YOUR APP ID', - # app_secret: 'YOUR APP SECRET', - # args: { scope: 'user:email' } } - - - - # - # 3. Advanced settings - # ========================== - - # GitLab Satellites - satellites: - # Relative paths are relative to Rails.root (default: tmp/repo_satellites/) - path: /home/git/gitlab-satellites/ - - ## Backup settings - backup: - path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) - # keep_time: 604800 # default: 0 (forever) (in seconds) - - ## GitLab Shell settings - gitlab_shell: - path: /home/git/gitlab-shell/ - - # REPOS_PATH MUST NOT BE A SYMLINK!!! - repos_path: /home/git/repositories/ - hooks_path: /home/git/gitlab-shell/hooks/ - - # Git over HTTP - upload_pack: true - receive_pack: true - - # If you use non-standard ssh port you need to specify it - # ssh_port: 22 - - ## Git settings - # CAUTION! - # Use the default values unless you really know what you are doing - git: - bin_path: /usr/bin/git - # The next value is the maximum memory size grit can use - # Given in number of bytes per git object (e.g. a commit) - # This value can be increased if you have very large commits - max_size: 5242880 # 5.megabytes - # Git timeout to read a commit, in seconds - timeout: 10 - - # - # 4. Extra customization - # ========================== - - extra: - ## Google analytics. Uncomment if you want it - # google_analytics_id: '_your_tracking_id' - - ## Piwik analytics. - # piwik_url: '_your_piwik_url' - # piwik_site_id: '_your_piwik_site_id' - - ## Text under sign-in page (Markdown enabled) - # sign_in_text: | - # ![Company Logo](http://www.companydomain.com/logo.png) - # [Learn more about CompanyName](http://www.companydomain.com/) - -development: - <<: *base - -test: - <<: *base - gravatar: - enabled: true - gitlab: - host: localhost - port: 80 - issues_tracker: - redmine: - title: "Redmine" - project_url: "http://redmine/projects/:issues_tracker_id" - issues_url: "http://redmine/:project_id/:issues_tracker_id/:id" - new_issue_url: "http://redmine/projects/:issues_tracker_id/issues/new" - -staging: - <<: *base diff --git a/gitlab-server/usr/share/gitlab-install/gitlab/config/initializers/rack_attack.rb b/gitlab-server/usr/share/gitlab-install/gitlab/config/initializers/rack_attack.rb deleted file mode 100644 index bc3234bf..00000000 --- a/gitlab-server/usr/share/gitlab-install/gitlab/config/initializers/rack_attack.rb +++ /dev/null @@ -1,18 +0,0 @@ -# 1. Rename this file to rack_attack.rb -# 2. Review the paths_to_be_protected and add any other path you need protecting -# - -paths_to_be_protected = [ - "#{Rails.application.config.relative_url_root}/users/password", - "#{Rails.application.config.relative_url_root}/users/sign_in", - "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session.json", - "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session", - "#{Rails.application.config.relative_url_root}/users", - "#{Rails.application.config.relative_url_root}/users/confirmation" -] - -unless Rails.env.test? - Rack::Attack.throttle('protected paths', limit: 10, period: 60.seconds) do |req| - req.ip if paths_to_be_protected.include?(req.path) && req.post? - end -end diff --git a/gitlab-server/usr/share/gitlab-install/gitlab/config/resque.yml b/gitlab-server/usr/share/gitlab-install/gitlab/config/resque.yml deleted file mode 100644 index f42ffe78..00000000 --- a/gitlab-server/usr/share/gitlab-install/gitlab/config/resque.yml +++ /dev/null @@ -1,3 +0,0 @@ -development: redis://127.0.0.1:6379 -test: redis://127.0.0.1:6379 -production: redis://127.0.0.1:6379 diff --git a/gitlab-server/usr/share/gitlab-install/gitlab/config/unicorn.rb b/gitlab-server/usr/share/gitlab-install/gitlab/config/unicorn.rb deleted file mode 100644 index 02dbd98a..00000000 --- a/gitlab-server/usr/share/gitlab-install/gitlab/config/unicorn.rb +++ /dev/null @@ -1,113 +0,0 @@ -# Sample verbose configuration file for Unicorn (not Rack) -# -# This configuration file documents many features of Unicorn -# that may not be needed for some applications. See -# http://unicorn.bogomips.org/examples/unicorn.conf.minimal.rb -# for a much simpler configuration file. -# -# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete -# documentation. - -# Uncomment and customize the last line to run in a non-root path -# WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. -# Note that four settings need to be changed for this to work. -# 1) In your application.rb file: config.relative_url_root = "/gitlab" -# 2) In your gitlab.yml file: relative_url_root: /gitlab -# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab" -# 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab" -# To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production -# -# ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab" - -# Use at least one worker per core if you're on a dedicated server, -# more will usually help for _short_ waits on databases/caches. -worker_processes 2 - -# Since Unicorn is never exposed to outside clients, it does not need to -# run on the standard HTTP port (80), there is no reason to start Unicorn -# as root unless it's from system init scripts. -# If running the master process as root and the workers as an unprivileged -# user, do this to switch euid/egid in the workers (also chowns logs): -# user "unprivileged_user", "unprivileged_group" - -# Help ensure your application will always spawn in the symlinked -# "current" directory that Capistrano sets up. -working_directory "/home/git/gitlab" # available in 0.94.0+ - -# listen on both a Unix domain socket and a TCP port, -# we use a shorter backlog for quicker failover when busy -listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 64 -listen "127.0.0.1:##UNICORN_PORT##", :tcp_nopush => true - -# nuke workers after 30 seconds instead of 60 seconds (the default) -timeout 30 - -# feel free to point this anywhere accessible on the filesystem -pid "/home/git/gitlab/tmp/pids/unicorn.pid" - -# By default, the Unicorn logger will write to stderr. -# Additionally, some applications/frameworks log to stderr or stdout, -# so prevent them from going to /dev/null when daemonized here: -stderr_path "/home/git/gitlab/log/unicorn.stderr.log" -stdout_path "/home/git/gitlab/log/unicorn.stdout.log" - -# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings -# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow -preload_app true -GC.respond_to?(:copy_on_write_friendly=) and - GC.copy_on_write_friendly = true - -# Enable this flag to have unicorn test client connections by writing the -# beginning of the HTTP headers before calling the application. This -# prevents calling the application for connections that have disconnected -# while queued. This is only guaranteed to detect clients on the same -# host unicorn runs on, and unlikely to detect disconnects even on a -# fast LAN. -check_client_connection false - -before_fork do |server, worker| - # the following is highly recomended for Rails + "preload_app true" - # as there's no need for the master process to hold a connection - defined?(ActiveRecord::Base) and - ActiveRecord::Base.connection.disconnect! - - # The following is only recommended for memory/DB-constrained - # installations. It is not needed if your system can house - # twice as many worker_processes as you have configured. - # - # This allows a new master process to incrementally - # phase out the old master process with SIGTTOU to avoid a - # thundering herd (especially in the "preload_app false" case) - # when doing a transparent upgrade. The last worker spawned - # will then kill off the old master process with a SIGQUIT. - old_pid = "#{server.config[:pid]}.oldbin" - if old_pid != server.pid - begin - sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU - Process.kill(sig, File.read(old_pid).to_i) - rescue Errno::ENOENT, Errno::ESRCH - end - end - # - # Throttle the master from forking too quickly by sleeping. Due - # to the implementation of standard Unix signal handlers, this - # helps (but does not completely) prevent identical, repeated signals - # from being lost when the receiving process is busy. - # sleep 1 -end - -after_fork do |server, worker| - # per-process listener ports for debugging/admin/migrations - # addr = "127.0.0.1:#{9293 + worker.nr}" - # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true) - - # the following is *required* for Rails + "preload_app true", - defined?(ActiveRecord::Base) and - ActiveRecord::Base.establish_connection - - # if preload_app is true, then you may also want to check and - # restart any other shared sockets/descriptors such as Memcached, - # and Redis. TokyoCabinet file handles are safe to reuse - # between any number of forked children (assuming your kernel - # correctly implements pread()/pwrite() system calls) -end diff --git a/gitlab-server/usr/share/gitlab-install/gitlab/lib/support/nginx/gitlab b/gitlab-server/usr/share/gitlab-install/gitlab/lib/support/nginx/gitlab deleted file mode 100644 index e9d3b1f0..00000000 --- a/gitlab-server/usr/share/gitlab-install/gitlab/lib/support/nginx/gitlab +++ /dev/null @@ -1,70 +0,0 @@ -# GITLAB -# Maintainer: @randx - -# CHUNKED TRANSFER -# It is a known issue that Git-over-HTTP requires chunked transfer encoding [0] which is not -# supported by Nginx < 1.3.9 [1]. As a result, pushing a large object with Git (i.e. a single large file) -# can lead to a 411 error. In theory you can get around this by tweaking this configuration file and either -# - installing an old version of Nginx with the chunkin module [2] compiled in, or -# - using a newer version of Nginx. -# -# At the time of writing we do not know if either of these theoretical solutions works. As a workaround -# users can use Git over SSH to push large files. -# -# [0] https://git.kernel.org/cgit/git/git.git/tree/Documentation/technical/http-protocol.txt#n99 -# [1] https://github.com/agentzh/chunkin-nginx-module#status -# [2] https://github.com/agentzh/chunkin-nginx-module - -upstream gitlab { - server unix:/home/git/gitlab/tmp/sockets/gitlab.socket; -} - -server { - listen *:##GITLAB_PORT## default_server; # e.g., listen 192.168.1.1:80; In most cases *:80 is a good idea - server_name ##GITLAB_HOSTNAME##; # e.g., server_name source.example.com; - server_tokens off; # don't show the version number, a security best practice - root /home/git/gitlab/public; - - # Increase this if you want to upload large attachments - # Or if you want to accept large git objects over http - client_max_body_size 20m; - - # individual nginx logs for this gitlab vhost - access_log /var/log/nginx/gitlab_access.log; - error_log /var/log/nginx/gitlab_error.log; - - location / { - # serve static files from defined root folder;. - # @gitlab is a named location for the upstream fallback, see below - try_files $uri $uri/index.html $uri.html @gitlab; - } - - # if a file, which is not found in the root folder is requested, - # then the proxy pass the request to the upsteam (gitlab unicorn) - location @gitlab { - # If you use https make sure you disable gzip compression - # to be safe against BREACH attack - # gzip off; - - proxy_read_timeout 300; # Some requests take more than 30 seconds. - proxy_connect_timeout 300; # Some requests take more than 30 seconds. - proxy_redirect off; - - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - proxy_pass http://gitlab; - } - - # Enable gzip compression as per rails guide: http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression - location ~ ^/(assets)/ { - root /home/git/gitlab/public; - #gzip_static on; # to serve pre-gzipped version - expires max; - add_header Cache-Control public; - } - - error_page 502 /502.html; -} diff --git a/gitlab-server/usr/share/gitlab-install/nginx.conf b/gitlab-server/usr/share/gitlab-install/nginx.conf deleted file mode 100644 index 6e40b0e9..00000000 --- a/gitlab-server/usr/share/gitlab-install/nginx.conf +++ /dev/null @@ -1,73 +0,0 @@ - -#user nobody; -worker_processes 1; - -#error_log logs/error.log; -#error_log logs/error.log notice; -#error_log logs/error.log info; - -#pid logs/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include mime.types; - default_type application/octet-stream; - - #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - # '$status $body_bytes_sent "$http_referer" ' - # '"$http_user_agent" "$http_x_forwarded_for"'; - - #access_log logs/access.log main; - - sendfile on; - #tcp_nopush on; - - #keepalive_timeout 0; - keepalive_timeout 65; - - #gzip on; - - include /home/git/gitlab/lib/support/nginx/gitlab; - include /home/gitlab_ci/gitlab-ci/lib/support/nginx/gitlab_ci; - - # another virtual host using mix of IP-, name-, and port-based configuration - # - #server { - # listen 8000; - # listen somename:8080; - # server_name somename alias another.alias; - - # location / { - # root html; - # index index.html index.htm; - # } - #} - - - # HTTPS server - # - #server { - # listen 443 ssl; - # server_name localhost; - - # ssl_certificate cert.pem; - # ssl_certificate_key cert.key; - - # ssl_session_cache shared:SSL:1m; - # ssl_session_timeout 5m; - - # ssl_ciphers HIGH:!aNULL:!MD5; - # ssl_prefer_server_ciphers on; - - # location / { - # root html; - # index index.html index.htm; - # } - #} - -} diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-backup.service b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-backup.service deleted file mode 100644 index 8672c36d..00000000 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-backup.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=GitLab Backup Run -After=postgres.service - -[Install] -WantedBy=gitlab.target - -[Service] -ExecStart=/usr/share/gitlab-install/backup-gitlab -User=postgres -Group=postgres diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-backup.timer b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-backup.timer deleted file mode 100644 index 1686843f..00000000 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-backup.timer +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=GitLab Backup Timer - -[Install] -WantedBy=gitlab.target - -[Timer] -OnCalendar=*-*-* 00:*:* diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-sidekiq.service b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-sidekiq.service deleted file mode 100644 index 9a1a82d2..00000000 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-sidekiq.service +++ /dev/null @@ -1,24 +0,0 @@ -##################################################### -# -# GitLab version : 5.x - 6.x -# Contributors : davispuh, mtorromeo, axilleas, boeserwolf91 -# Downloaded from : https://github.com/gitlabhq/gitlab-recipes/tree/master/init/systemd -# -#################################################### - -[Unit] -Description=GitLab CI Sidekiq Worker - -[Service] -Type=forking -User=gitlab_ci -WorkingDirectory=/home/gitlab_ci/gitlab-ci -Environment=RAILS_ENV=production -SyslogIdentifier=gitlab-ci-sidekiq -PIDFile=/home/gitlab_ci/gitlab-ci/tmp/pids/sidekiq.pid - -ExecStart=/usr/bin/bundle exec "sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e production -P tmp/pids/sidekiq.pid -d -L log/sidekiq.log >> log/sidekiq.log 2>&1" -ExecStop=/usr/bin/bundle exec "sidekiqctl stop /home/gitlab_ci/gitlab-ci/tmp/pids/sidekiq.pid >> /home/gitlab_ci/gitlab-ci/log/sidekiq.log 2>&1" - -[Install] -WantedBy=gitlab.target diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service deleted file mode 100644 index 151f9677..00000000 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service +++ /dev/null @@ -1,24 +0,0 @@ -##################################################### -# -# GitLab version : 5.x - 6.x -# Contributors : davispuh, mtorromeo, axilleas, boeserwolf91 -# Downloaded from : https://github.com/gitlabhq/gitlab-recipes/tree/master/init/systemd -# -#################################################### - -[Unit] -Description=GitLab CI Unicorn Server - -[Service] -User=gitlab_ci -WorkingDirectory=/home/gitlab_ci/gitlab-ci -Environment=RAILS_ENV=production -SyslogIdentifier=gitlab-ci-unicorn -PIDFile=/home/gitlab_ci/gitlab-ci/tmp/pids/unicorn.pid - -ExecStart=/usr/bin/bundle exec "unicorn_rails -c /home/gitlab_ci/gitlab-ci/config/unicorn.rb -E production" -ExecStop=/bin/kill -s QUIT $MAINPID -ExecReload=/bin/kill -s USR2 $MAINPID - -[Install] -WantedBy=gitlab.target diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-sidekiq.service b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-sidekiq.service deleted file mode 100644 index 82ff78d4..00000000 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-sidekiq.service +++ /dev/null @@ -1,24 +0,0 @@ -##################################################### -# -# GitLab version : 5.x - 6.x -# Contributors : davispuh, mtorromeo, axilleas, boeserwolf91 -# Downloaded from : https://github.com/gitlabhq/gitlab-recipes/tree/master/init/systemd -# -#################################################### - -[Unit] -Description=GitLab Sidekiq Worker - -[Service] -Type=forking -User=git -WorkingDirectory=/home/git/gitlab -Environment=RAILS_ENV=production -SyslogIdentifier=gitlab-sidekiq -PIDFile=/home/git/gitlab/tmp/pids/sidekiq.pid - -ExecStart=/usr/bin/bundle exec "sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e production -P tmp/pids/sidekiq.pid -d -L log/sidekiq.log >> log/sidekiq.log 2>&1" -ExecStop=/usr/bin/bundle exec "sidekiqctl stop /home/git/gitlab/tmp/pids/sidekiq.pid >> /home/git/gitlab/log/sidekiq.log 2>&1" - -[Install] -WantedBy=gitlab.target diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service deleted file mode 100644 index a901d323..00000000 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service +++ /dev/null @@ -1,24 +0,0 @@ -##################################################### -# -# GitLab version : 5.x - 6.x -# Contributors : davispuh, mtorromeo, axilleas, boeserwolf91 -# Downloaded from : https://github.com/gitlabhq/gitlab-recipes/tree/master/init/systemd -# -#################################################### - -[Unit] -Description=GitLab Unicorn Server - -[Service] -User=git -WorkingDirectory=/home/git/gitlab -Environment=RAILS_ENV=production -SyslogIdentifier=gitlab-unicorn -PIDFile=/home/git/gitlab/tmp/pids/unicorn.pid - -ExecStart=/usr/bin/bundle exec "unicorn_rails -c /home/git/gitlab/config/unicorn.rb -E production" -ExecStop=/bin/kill -s QUIT $MAINPID -ExecReload=/bin/kill -s USR2 $MAINPID - -[Install] -WantedBy=gitlab.target diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab.target b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab.target deleted file mode 100644 index 11e85441..00000000 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab.target +++ /dev/null @@ -1,15 +0,0 @@ -########################################################################################### -# -# GitLab version : 5.x - 6.x -# Contributors : davispuh, mtorromeo, axilleas, boeserwolf91 -# Downloaded from : https://github.com/gitlabhq/gitlab-recipes/tree/master/init/systemd -# -########################################################################################### - -[Unit] -Description=GitLab - Self Hosted Git Management -Requires=redis.service postgres.service -After=redis.service postgres.service syslog.target network.target - -[Install] -WantedBy=multi-user.target diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/nginx.service b/gitlab-server/usr/share/gitlab-install/systemd-units/nginx.service deleted file mode 100644 index 0a50c50b..00000000 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/nginx.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=The nginx HTTP and reverse proxy server -After=syslog.target network.target remote-fs.target nss-lookup.target - -[Service] -Type=forking -PIDFile=/etc/nginx/nginx.pid -ExecStartPre=/usr/sbin/nginx -t -ExecStart=/usr/sbin/nginx -ExecReload=/bin/kill -s HUP $MAINPID -ExecStop=/bin/kill -s QUIT $MAINPID -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/postgres.service b/gitlab-server/usr/share/gitlab-install/systemd-units/postgres.service deleted file mode 100644 index ed46d965..00000000 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/postgres.service +++ /dev/null @@ -1,25 +0,0 @@ -[Unit] -Description=PostgreSQL database server -After=network.target - -[Service] -Type=forking -TimeoutSec=120 -User=postgres -Group=postgres - -Environment=PGROOT=/home/postgres/pgsql - -SyslogIdentifier=postgres -PIDFile=/home/postgres/pgsql/data/postmaster.pid - -ExecStart= /usr/bin/pg_ctl -s -D ${PGROOT}/data start -w -t 120 -ExecReload=/usr/bin/pg_ctl -s -D ${PGROOT}/data reload -ExecStop= /usr/bin/pg_ctl -s -D ${PGROOT}/data stop -m fast - -# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in -# killing Postgres, so adjust it downward -OOMScoreAdjust=-200 - -[Install] -WantedBy=multi-user.target diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/redis.service b/gitlab-server/usr/share/gitlab-install/systemd-units/redis.service deleted file mode 100644 index c936f8da..00000000 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/redis.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Redis Server -After=network.target - -[Service] -Type=simple -ExecStart=/usr/bin/redis-server -ExecStop=/bin/kill -15 $MAINPID -PIDFile=/var/run/redis.pid -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/gitlab-server/usr/share/gitlab-setup b/gitlab-server/usr/share/gitlab-setup deleted file mode 100755 index e60dfcdf..00000000 --- a/gitlab-server/usr/share/gitlab-setup +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2014 Codethink Limited -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -set -e - -# install bundler (not nice, we need to figure out how to do this traceably) -gem install bundler - -# create required users -if [ `grep -c '^git:' /etc/passwd` -ne 1 ] ; then adduser -D --gecos 'GitLab' -s /bin/sh git ; fi -adduser -D -s /bin/sh postgres -adduser -D --gecos 'GitLab CI' -s /bin/sh gitlab_ci - -# initialize postgres database, start server -su -c "mkdir -p pgsql/data" - postgres -su -c "pg_ctl -D pgsql/data initdb" - postgres -su -c "pg_ctl -D pgsql/data -l logfile start" - postgres - -# wait for the database server to start -echo "Waiting for database..." -sleep 2s - -# create gitlab database -su -c "psql -d template1 -c 'CREATE USER git;'" - postgres -su -c "psql -d template1 -c 'CREATE DATABASE gitlabhq_production OWNER git;'" - postgres - -# create the gitlab ci database -su -c "psql -d template1 -c 'CREATE USER gitlab_ci;'" - postgres -su -c "psql -d template1 -c 'CREATE DATABASE gitlab_ci_production OWNER gitlab_ci;'" - postgres - -# set up git config for gitlab user -su -c "git config --global http.sslVerify false" - git -su -c "git config --global user.name 'GitLab'" - git -su -c "git config --global user.email 'gitlab@localhost'" - git -su -c "git config --global core.autocrlf input" - git - -# install gitlab shell -su -c "cp -r /usr/share/gitlab-shell gitlab-shell" - git -cd /home/git/gitlab-shell -cp /usr/share/gitlab-install/gitlab-shell/config.yml ./config.yml -su -c "~/gitlab-shell/bin/install" - git - -# install gitlab -su -c "cp -r /usr/share/gitlab-ce gitlab" - git -cd /home/git/gitlab -su -c "cp config/database.yml.postgresql config/database.yml" git -su -c "cp -r /usr/share/gitlab-install/gitlab/config/* config/" git - -su -c "chmod -R u+rwX log/" git -su -c "chmod -R u+rwX tmp/" git -su -c "chmod o-rwx config/database.yml" git - -su -c "/usr/bin/redis-server" - git & -su -c "bundle install --deployment --without development test mysql aws" git -su -c "export force='yes'; bundle exec rake gitlab:setup RAILS_ENV=production" git -su -c "bundle exec rake assets:precompile RAILS_ENV=production" git - -# set up git config for gitlab_ci user -su -c "git config --global http.sslVerify false" - gitlab_ci -su -c "git config --global user.name 'GitLab CI'" - gitlab_ci -su -c "git config --global user.email 'gitlab_ci@localhost'" - gitlab_ci -su -c "git config --global core.autocrlf input" - gitlab_ci - -# install gitlab ci -su -c "cp -r /usr/share/gitlab-ci gitlab-ci" - gitlab_ci -cd /home/gitlab_ci/gitlab-ci -su -c "cp config/database.yml.postgresql config/database.yml" gitlab_ci -su -c "cp -r /usr/share/gitlab-install/gitlab-ci/config/* config/" gitlab_ci - -su -c "mkdir -p tmp/sockets" gitlab_ci -su -c "mkdir -p tmp/pids" gitlab_ci -su -c "chmod -R u+rwx tmp/sockets" gitlab_ci -su -c "chmod -R u+rwx tmp/pids" gitlab_ci - -su -c "bundle install --without development test mysql --deployment" gitlab_ci -su -c "bundle exec rake setup RAILS_ENV=production" gitlab_ci -su -c "bundle exec whenever -w RAILS_ENV=production" gitlab_ci - -# configure nginx -addgroup nobody -mkdir -p /var/log/nginx -cp /usr/share/gitlab-install/gitlab/lib/support/nginx/gitlab /home/git/gitlab/lib/support/nginx/ -cp /usr/share/gitlab-install/gitlab-ci/lib/support/nginx/gitlab_ci /home/gitlab_ci/gitlab-ci/lib/support/nginx/ -cp /usr/share/gitlab-install/nginx.conf /etc/nginx/nginx.conf - -# make systemd units to start gitlab and required stuff on boot -cd /etc/systemd/system -cp /usr/share/gitlab-install/systemd-units/* . -systemctl enable redis.service nginx.service postgres.service gitlab.target gitlab-unicorn.service gitlab-sidekiq.service gitlab-ci-sidekiq.service gitlab-ci-unicorn.service gitlab-backup.timer gitlab-backup.service -reboot diff --git a/gitlab.configure b/gitlab.configure deleted file mode 100644 index 9798c775..00000000 --- a/gitlab.configure +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2014 Codethink Limited -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# This is a "morph deploy" configuration extension to fully configure -# a GitLab and GitLab CI instance at deployment time. It uses the -# following variables from the environment: -# -# * GITLAB_HOSTNAME -# * GITLAB_PORT -# * GITLAB_EMAIL -# * UNICORN_PORT -# * CI_PORT -# * UNICORN_CI_PORT -# * MAIL_SEND_TYPE -# * SMTP_ADDR -# * SMTP_PORT -# * SMTP_USER -# * SMTP_PASS -# * SMTP_DOMAIN - -set -e - -ROOT="$1" - - -########################################################################## -# Substitutions in configuration files -########################################################################## - -echo "Creating /etc/gitlab-setup.sed" - -cat < "$ROOT"/etc/gitlab-setup.sed -s/##GITLAB_HOSTNAME##/$GITLAB_HOSTNAME/g -s/##GITLAB_PORT##/$GITLAB_PORT/g -s/##GITLAB_EMAIL##/$GITLAB_EMAIL/g -s/##UNICORN_PORT##/$UNICORN_PORT/g -s/##CI_PORT##/$CI_PORT/g -s/##UNICORN_CI_PORT##/$UNICORN_CI_PORT/g -EOF - -echo "Performing substitutions in /usr/share/gitlab config" - -sed -f "$ROOT"/etc/gitlab-setup.sed -i \ - "$ROOT"/usr/share/gitlab-install/gitlab/config/gitlab.yml \ - "$ROOT"/usr/share/gitlab-install/gitlab/config/unicorn.rb \ - "$ROOT"/usr/share/gitlab-install/gitlab/lib/support/nginx/gitlab \ - "$ROOT"/usr/share/gitlab-install/gitlab-shell/config.yml \ - "$ROOT"/usr/share/gitlab-install/gitlab-ci/config/application.yml \ - "$ROOT"/usr/share/gitlab-install/gitlab-ci/config/unicorn.rb \ - "$ROOT"/usr/share/gitlab-install/gitlab-ci/lib/support/nginx/gitlab_ci \ - "$ROOT"/usr/share/gitlab-install/nginx.conf - -########################################################################## - -echo "Create gitlab-setup unit file" -cat < "$ROOT/etc/systemd/system/gitlab-setup.service" -[Unit] -Description=Run gitlab-setup (once) -Requires=network.target -After=network.target -Requires=local-fs.target -After=local-fs.target - -ConditionPathExists=!/home/git/gitlab - -[Service] -Type=oneshot -ExecStart=/usr/share/gitlab-setup -Restart=no - -[Install] -WantedBy=multi-user.target -EOF - -ln -s "/etc/systemd/system/gitlab-setup.service" \ - "$ROOT/etc/systemd/system/multi-user.target.wants/gitlab-setup.service" - -########################################################################## - -rubyescape() { - # In ruby, single quoted strings need \ and ' escaping - printf "%s\n" "$1" | sed -e "s/['\\]/\\\&/g" \ - -e "s/^/'/" \ - -e "s/$/'/" -} - -sedescape() { - # Escape all non-alphanumeric characters - printf "%s\n" "$1" | sed -e 's/\W/\\&/g' -} - -do_escapes() { - printf "%s\n" "$(sedescape "$(rubyescape "$1")")" -} - -if [ "$MAIL_SEND_TYPE" = "smtp" ]; then - - echo "Setting up SMTP for sending e-mail" - - for CONFIG_PATH in \ - "/usr/share/gitlab-ce/config" "/usr/share/gitlab-ci/config" - do - sed -i 's/sendmail/smtp/' \ - "$ROOT$CONFIG_PATH/environments/production.rb" - - sed -e s/\"email.server.com\"/"$(do_escapes "$SMTP_ADDR")/g" \ - -e s/\"smtp\"/"$(do_escapes "$SMTP_USER")/g" \ - -e s/\"123456\"/"$(do_escapes "$SMTP_PASS")/g" \ - -e s/\"gitlab.company.com\"/"$(do_escapes "$SMTP_DOMAIN")/g" \ - -e s/456/$SMTP_PORT/g \ - <"$ROOT$CONFIG_PATH/initializers/smtp_settings.rb.sample" \ - >"$ROOT$CONFIG_PATH/initializers/smtp_settings.rb" - done -fi diff --git a/scripts/licensecheck.sh b/scripts/licensecheck.sh index 7e4c4b91..a57b2f76 100755 --- a/scripts/licensecheck.sh +++ b/scripts/licensecheck.sh @@ -54,6 +54,7 @@ m4 \ make \ nano \ patch \ +rsync \ texinfo-tarball" gplv3_repos="" diff --git a/strata/ansible.morph b/strata/ansible.morph index 33a23750..4af0e805 100644 --- a/strata/ansible.morph +++ b/strata/ansible.morph @@ -8,5 +8,5 @@ chunks: - name: ansible morph: strata/ansible/ansible.morph repo: upstream:ansible - ref: ebc8d48d34296fe010096f044e2b7591df37a622 + ref: 0a7124541247cc613352054f4bc0c3e116e0b657 unpetrify-ref: baserock/v1.8.4 diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph index a3a195db..c0861105 100644 --- a/strata/baserock-import.morph +++ b/strata/baserock-import.morph @@ -2,6 +2,7 @@ name: baserock-import kind: stratum description: Tools for importing software into Baserock definitions. build-depends: +- morph: strata/python-common.morph - morph: strata/morph-utils.morph chunks: - name: ansicolor diff --git a/strata/build-essential/fhs-dirs.morph b/strata/build-essential/fhs-dirs.morph index 64474872..f4a1b1e9 100644 --- a/strata/build-essential/fhs-dirs.morph +++ b/strata/build-essential/fhs-dirs.morph @@ -7,7 +7,6 @@ install-commands: - install -m 600 shadow "$DESTDIR/etc/shadow" - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" - install -m 644 group "$DESTDIR/etc/group" -- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf" - install -m 644 issue "$DESTDIR/etc/issue" - install -m 644 services "$DESTDIR/etc/services" - install -m 644 protocols "$DESTDIR/etc/protocols" diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph index 4ba6b60e..3b80452a 100644 --- a/strata/build-essential/glibc.morph +++ b/strata/build-essential/glibc.morph @@ -81,5 +81,13 @@ install-commands: netgroup: nis EOF - install -m 644 -o root -g root nsswitch.conf "$DESTDIR/etc/nsswitch.conf" +- | + cat < ld.so.conf + /lib + /usr/lib + /usr/local/lib + include /etc/ld.so.conf.d/*.conf + EOF +- install -m 644 -o root -g root ld.so.conf "$DESTDIR/etc/ld.so.conf" - case "$MORPH_ARCH" in armv7*hf*) ln -s ld-2.20.so "$DESTDIR/lib/ld-linux.so.3" ;; esac diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.morph index 14a6e253..64080217 100644 --- a/strata/build-essential/stage2-fhs-dirs.morph +++ b/strata/build-essential/stage2-fhs-dirs.morph @@ -9,7 +9,6 @@ install-commands: - install -m 600 shadow "$DESTDIR/etc/shadow" - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" - install -m 644 group "$DESTDIR/etc/group" -- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf" - install -m 644 issue "$DESTDIR/etc/issue" - install -m 644 services "$DESTDIR/etc/services" - install -m 644 protocols "$DESTDIR/etc/protocols" diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph index 1fe00e41..9ca0d4c1 100644 --- a/strata/build-essential/stage2-glibc.morph +++ b/strata/build-essential/stage2-glibc.morph @@ -22,6 +22,15 @@ build-commands: - cd o && make localtime=UTC install-commands: - cd o && make install_root="$DESTDIR" localtime=UTC install +- mkdir -p "$DESTDIR/etc" +- | + cat < ld.so.conf + /lib + /usr/lib + /usr/local/lib + include /etc/ld.so.conf.d/*.conf + EOF +- install -m 644 -o root -g root ld.so.conf "$DESTDIR/etc/ld.so.conf" - sh stage2-glibc-fix-specs - install -d $DESTDIR/lib - | diff --git a/strata/core.morph b/strata/core.morph index b424a023..263eac60 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -273,3 +273,12 @@ chunks: unpetrify-ref: baserock/v2.7.1 build-depends: - shadow +- name: libxslt + repo: upstream:libxslt + ref: 73e08bf7c36a9145d38f51d37e66529b873c011a + unpetrify-ref: master + build-depends: + - autoconf-tarball + - libtool-tarball + - automake + - libxml2 diff --git a/strata/foundation.morph b/strata/foundation.morph index 775444c9..7bcfc77d 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -135,10 +135,6 @@ chunks: build-depends: - glib - systemd -- name: libxslt - repo: upstream:libxslt - ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e - unpetrify-ref: baserock/morph - name: openssh morph: strata/foundation/openssh.morph repo: upstream:openssh-git @@ -160,3 +156,8 @@ chunks: build-depends: - dbus - glib +- name: rsync + morph: strata/foundation/rsync.morph + repo: upstream:rsync + ref: 7cb0de6326c915a72253fd103dae93308031ec3f + unpetrify-ref: v3.1.1 diff --git a/strata/foundation/rsync.morph b/strata/foundation/rsync.morph new file mode 100644 index 00000000..fb10f94e --- /dev/null +++ b/strata/foundation/rsync.morph @@ -0,0 +1,9 @@ +name: rsync +kind: chunk +build-system: autotools +build-commands: +- make proto +- make +install-commands: +- make install +- install -D -m 755 packaging/systemd/rsync.service "$DESTDIR$PREFIX"/lib/systemd/system/rsync.service diff --git a/strata/genivi.morph b/strata/genivi.morph index 197943cc..5294dc4e 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -87,7 +87,7 @@ chunks: - persistence-client-library - name: libarchive morph: strata/genivi/libarchive.morph - repo: git://github.com/libarchive/libarchive.git + repo: upstream:libarchive ref: 19f23e191f9d3e1dd2a518735046100419965804 unpetrify-ref: v3.1.2 - name: persistence-administrator diff --git a/strata/gitlab.morph b/strata/gitlab.morph deleted file mode 100644 index ab77e7bb..00000000 --- a/strata/gitlab.morph +++ /dev/null @@ -1,21 +0,0 @@ -name: gitlab -kind: stratum -description: gitlab components for server, ci etc -build-depends: -- morph: strata/ruby.morph -chunks: -- name: gitlab-ce - morph: strata/gitlab/gitlab-ce.morph - repo: upstream:gitlab/gitlab-ce - ref: 53d98a77d34cbfddaef9eb25cf5f651a78550425 - unpetrify-ref: baserock/v7.0.0 -- name: gitlab-ci - morph: strata/gitlab/gitlab-ci.morph - repo: upstream:gitlab/gitlab-ci - ref: c74044d65dec2ba8311e242c84e07a67abd52d37 - unpetrify-ref: baserock/morph -- name: gitlab-shell - morph: strata/gitlab/gitlab-shell.morph - repo: upstream:gitlab/gitlab-shell - ref: 0b4106d57223c666d9360339fd3790174aa43800 - unpetrify-ref: baserock/morph diff --git a/strata/gitlab/gitlab-ce.morph b/strata/gitlab/gitlab-ce.morph deleted file mode 100644 index 571881f8..00000000 --- a/strata/gitlab/gitlab-ce.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: gitlab-ce -kind: chunk -install-commands: -- mkdir -p "$DESTDIR/$PREFIX/share/gitlab-ce" -- cp -R * "$DESTDIR/$PREFIX/share/gitlab-ce" -- chmod -R a+rX,g+w "$DESTDIR/$PREFIX/share/gitlab-ce" diff --git a/strata/gitlab/gitlab-ci.morph b/strata/gitlab/gitlab-ci.morph deleted file mode 100644 index 99d01367..00000000 --- a/strata/gitlab/gitlab-ci.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: gitlab-ci -kind: chunk -install-commands: -- mkdir -p "$DESTDIR/$PREFIX/share/gitlab-ci" -- cp -R * "$DESTDIR/$PREFIX/share/gitlab-ci" -- chmod -R a+rX,g+w "$DESTDIR/$PREFIX/share/gitlab-ci" diff --git a/strata/gitlab/gitlab-shell.morph b/strata/gitlab/gitlab-shell.morph deleted file mode 100644 index 069c6c41..00000000 --- a/strata/gitlab/gitlab-shell.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: gitlab-shell -kind: chunk -install-commands: -- mkdir -p "$DESTDIR/$PREFIX/share/gitlab-shell" -- cp -R * "$DESTDIR/$PREFIX/share/gitlab-shell" -- chmod -R a+rX,g+w "$DESTDIR/$PREFIX/share/gitlab-shell" diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph index 18339df2..00ae5752 100644 --- a/strata/lorry-controller.morph +++ b/strata/lorry-controller.morph @@ -6,10 +6,11 @@ description: | This is a component of Trove, but can also be used with other Git servers. build-depends: -- morph: strata/python-core.morph +- morph: strata/python-cliapp.morph +- morph: strata/python-wsgi.morph chunks: - name: lorry-controller morph: strata/lorry-controller/lorry-controller.morph repo: baserock:baserock/lorry-controller - ref: ce97e140f61cfc3781c3082febeacd0e5fb145cd + ref: f3f59d1415bfdb18f17bd910b829a8d128c1562a unpetrify-ref: master diff --git a/strata/lorry.morph b/strata/lorry.morph index a17c6627..b3a0c779 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -10,7 +10,8 @@ description: | The commandline tools 'hg', 'bzr', 'svn', and 'cvs' are also made available by this stratum. build-depends: -- morph: strata/morph-utils.morph +- morph: strata/foundation.morph +- morph: strata/python-cliapp.morph chunks: - name: bzr-tarball repo: upstream:bzr-tarball diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 6ce7efa4..6aeafb1b 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -2,7 +2,8 @@ name: morph-utils kind: stratum build-depends: - morph: strata/core.morph -- morph: strata/python-core.morph +- morph: strata/python-cliapp.morph +- morph: strata/python-wsgi.morph chunks: - name: python-ttystatus morph: strata/morph-utils/python-ttystatus.morph @@ -23,54 +24,23 @@ chunks: repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph -- name: python-coveragepy - morph: strata/morph-utils/python-coveragepy.morph - repo: upstream:python-coveragepy - ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 - unpetrify-ref: baserock/morph -- name: python-coverage-test-runner - repo: upstream:python-coverage-test-runner - ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 - unpetrify-ref: baserock/morph - build-depends: - - python-coveragepy -- name: cliapp - repo: upstream:cliapp - ref: cec20cedd062a3aef1b04f997e77b45090c07806 - unpetrify-ref: baserock/morph - build-depends: - - python-coverage-test-runner - name: cmdtest morph: strata/morph-utils/cmdtest.morph repo: upstream:cmdtest ref: ac91791842c6e7e6eda3213916af413255999c7b unpetrify-ref: baserock/morph build-depends: - - cliapp - python-ttystatus - python-markdown -- name: bottle - repo: upstream:bottle - ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f - unpetrify-ref: baserock/morph -- name: flup - repo: upstream:flup - ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 - unpetrify-ref: baserock/morph - name: pylru repo: upstream:python-packages/pylru ref: 221dd259f5c34562c835611d1cf62384b9019da4 unpetrify-ref: master - name: morph - morph: strata/morph-utils/morph.morph repo: baserock:baserock/morph - ref: 68395a12c79c22e266b4a06095533e38da6e29d0 + ref: 60aedc8d97679159678e7ebad2f2d81768e9736a unpetrify-ref: master build-depends: - - cliapp - cmdtest - - python-coverage-test-runner - pyfilesystem - - bottle - - flup - pylru diff --git a/strata/morph-utils/python-coveragepy.morph b/strata/morph-utils/python-coveragepy.morph deleted file mode 100644 index ed5e3d87..00000000 --- a/strata/morph-utils/python-coveragepy.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: python-coveragepy -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/python-cliapp.morph b/strata/python-cliapp.morph new file mode 100644 index 00000000..ff6fda3e --- /dev/null +++ b/strata/python-cliapp.morph @@ -0,0 +1,24 @@ +name: python-cliapp +kind: stratum +description: | + Cliapp command line application framework. +build-depends: +- morph: strata/python-core.morph +chunks: +- name: python-coveragepy + morph: strata/morph-utils/python-coveragepy.morph + repo: upstream:python-coveragepy + ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 + unpetrify-ref: baserock/morph +- name: python-coverage-test-runner + repo: upstream:python-coverage-test-runner + ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 + unpetrify-ref: baserock/morph + build-depends: + - python-coveragepy +- name: cliapp + repo: upstream:cliapp + ref: cec20cedd062a3aef1b04f997e77b45090c07806 + unpetrify-ref: baserock/morph + build-depends: + - python-coverage-test-runner diff --git a/strata/python-cliapp/python-coveragepy.morph b/strata/python-cliapp/python-coveragepy.morph new file mode 100644 index 00000000..ed5e3d87 --- /dev/null +++ b/strata/python-cliapp/python-coveragepy.morph @@ -0,0 +1,6 @@ +name: python-coveragepy +kind: chunk +build-commands: +- python setup.py build +install-commands: +- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/python-core.morph b/strata/python-core.morph index 342e8c68..481f11bf 100644 --- a/strata/python-core.morph +++ b/strata/python-core.morph @@ -36,3 +36,13 @@ chunks: unpetrify-ref: baserock/morph build-depends: - python-setuptools +- name: cython + repo: upstream:cython + ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d + unpetrify-ref: 0.22 +- name: python-lxml + repo: upstream:python-lxml + ref: 14505bc62f5f1fc9fb0ff007955f3e67ab4562bb + unpetrify-ref: lxml-3.4.0 + build-depends: + - cython diff --git a/strata/python-wsgi.morph b/strata/python-wsgi.morph new file mode 100644 index 00000000..289d27ba --- /dev/null +++ b/strata/python-wsgi.morph @@ -0,0 +1,15 @@ +name: python-wsgi +kind: stratum +description: | + Python modules for web applications using Web Server Gateway Interface. +build-depends: +- morph: strata/python-core.morph +chunks: +- name: bottle + repo: upstream:bottle + ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f + unpetrify-ref: baserock/morph +- name: flup + repo: upstream:flup + ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 + unpetrify-ref: baserock/morph diff --git a/strata/tools.morph b/strata/tools.morph index bdc7e8e7..2bbf7bfa 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -27,11 +27,6 @@ chunks: repo: upstream:lsof ref: fffb8558208586338587027c265fd0eca44466be unpetrify-ref: baserock/morph -- name: rsync - morph: strata/tools/rsync.morph - repo: upstream:rsync - ref: 7cb0de6326c915a72253fd103dae93308031ec3f - unpetrify-ref: v3.1.1 - name: strace repo: upstream:strace ref: 6d8c0637e8dd0f65c667af33c612230552419db1 diff --git a/strata/tools/rsync.morph b/strata/tools/rsync.morph deleted file mode 100644 index fb10f94e..00000000 --- a/strata/tools/rsync.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: rsync -kind: chunk -build-system: autotools -build-commands: -- make proto -- make -install-commands: -- make install -- install -D -m 755 packaging/systemd/rsync.service "$DESTDIR$PREFIX"/lib/systemd/system/rsync.service diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 27767e36..ef163561 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -6,6 +6,7 @@ description: | kernel history to check which config are needed for openvswitch, libvirt, or ebtables, for example. build-depends: +- morph: strata/python-core.morph - morph: strata/connman-common.morph - morph: strata/lvm.morph chunks: @@ -66,23 +67,12 @@ chunks: unpetrify-ref: master build-depends: - pycurl -- name: cython - repo: upstream:cython - ref: 005d38d5921a603d5f4d413aae72f98a6d33192f - unpetrify-ref: master -- name: python-lxml - repo: upstream:python-lxml - ref: 8fc99f8ef3e2f12e74fb407ae62c5db50cfe7b92 - unpetrify-ref: baserock/morph - build-depends: - - cython - name: libvirt-python repo: upstream:libvirt-python ref: 8e09c79a07b097a6ba9af83be4916fb9c9538500 unpetrify-ref: v1.2.10 build-depends: - libvirt - - python-lxml - urlgrabber - name: gnome-common repo: upstream:gnome-common diff --git a/strip-gplv3.configure b/strip-gplv3.configure index 75143d08..c08061ad 100755 --- a/strip-gplv3.configure +++ b/strip-gplv3.configure @@ -47,6 +47,7 @@ class StripGPLv3ConfigureExtension(cliapp.Application): ['make', ''], ['nano', ''], ['patch', ''], + ['rsync', ''], ['texinfo-tarball', ''], ] diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 22eeb1e4..83fea92e 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-armv7-highbank.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index f05f0e29..53bda1a5 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-jetson.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph index 08802a00..63dcb432 100644 --- a/systems/build-system-armv8l64.morph +++ b/systems/build-system-armv8l64.morph @@ -18,6 +18,10 @@ strata: morph: strata/bsp-armv8l64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 87f9a735..8613bd4c 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-ppc64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index 30c85e25..7c423139 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -14,6 +14,10 @@ strata: morph: strata/python-core.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index fd39afae..0989375b 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-x86_32-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index c07982ff..f3ab9e12 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -14,6 +14,10 @@ strata: morph: strata/python-core.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 5fdaa4ce..cfc2fdeb 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index 730c00d4..95b17dc0 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -22,6 +22,10 @@ strata: morph: strata/ruby.morph - name: ntpd morph: strata/ntpd.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/cross-bootstrap-system-armv7lhf-generic.morph b/systems/cross-bootstrap-system-armv7lhf-generic.morph index 23817c0c..f0a2780b 100644 --- a/systems/cross-bootstrap-system-armv7lhf-generic.morph +++ b/systems/cross-bootstrap-system-armv7lhf-generic.morph @@ -7,6 +7,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: cross-bootstrap diff --git a/systems/cross-bootstrap-system-armv8l64-generic.morph b/systems/cross-bootstrap-system-armv8l64-generic.morph index c35cff5f..2bf192d3 100644 --- a/systems/cross-bootstrap-system-armv8l64-generic.morph +++ b/systems/cross-bootstrap-system-armv8l64-generic.morph @@ -7,6 +7,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: cross-bootstrap diff --git a/systems/cross-bootstrap-system-ppc64-generic.morph b/systems/cross-bootstrap-system-ppc64-generic.morph index 40c80c00..9d736f94 100644 --- a/systems/cross-bootstrap-system-ppc64-generic.morph +++ b/systems/cross-bootstrap-system-ppc64-generic.morph @@ -7,6 +7,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: cross-bootstrap diff --git a/systems/cross-bootstrap-system-x86_64-generic.morph b/systems/cross-bootstrap-system-x86_64-generic.morph index 646a04d3..ac919d66 100644 --- a/systems/cross-bootstrap-system-x86_64-generic.morph +++ b/systems/cross-bootstrap-system-x86_64-generic.morph @@ -7,6 +7,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: cross-bootstrap diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index 74742a85..e32db851 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -15,6 +15,10 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 69681f7b..9ae051d1 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-armv7-highbank.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 9ed68978..12a2b2b6 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-armv7-versatile.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index 940b7725..ec6fea5e 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-wandboard.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 8b754254..2023ac21 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -15,6 +15,10 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 54eeeee7..2c7f8ed2 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-armv7b-highbank.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 95212d57..1e2a8f8e 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -15,6 +15,10 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 5c987497..3ef00c34 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -17,6 +17,10 @@ strata: morph: strata/bsp-armv7-highbank.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index 9cdc1270..dfc28c45 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -15,6 +15,10 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index b69b3b13..631692e7 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -17,6 +17,10 @@ strata: morph: strata/bsp-wandboard.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph index c4af1d17..bad6d6a9 100644 --- a/systems/devel-system-armv8l64.morph +++ b/systems/devel-system-armv8l64.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-armv8l64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 74d7e38e..1ec03145 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -15,6 +15,10 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index 50cffd69..bfbf3fbb 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-ppc64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 1ade237e..e83b1a55 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -15,6 +15,10 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index de75a70a..c707125c 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-x86_32-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index 23db60c1..00e72c84 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -15,6 +15,10 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index 46c7c4e5..e0bb1a21 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index ca0c717b..fc40e1f5 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -16,6 +16,10 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph deleted file mode 100644 index 8f89ec74..00000000 --- a/systems/gitlab-ci-runner.morph +++ /dev/null @@ -1,58 +0,0 @@ -name: gitlab-ci-runner -kind: system -description: A system to run build tests as part of GitLab CI architecture. -arch: x86_64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph -- name: connectivity - morph: strata/connectivity.morph -- name: connman-common - morph: strata/connman-common.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph -- name: x-common - morph: strata/x-common.morph -- name: x-generic - morph: strata/x-generic.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph -- name: genivi - morph: strata/genivi.morph -- name: tools - morph: strata/tools.morph -- name: lvm - morph: strata/lvm.morph -- name: python-core - morph: strata/python-core.morph -- name: virtualization - morph: strata/virtualization.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: python-common - morph: strata/python-common.morph -- name: databases - morph: strata/databases.morph -- name: pcre-utils - morph: strata/pcre-utils.morph -- name: webtools - morph: strata/webtools.morph -- name: ruby - morph: strata/ruby.morph -- name: nfs - morph: strata/nfs.morph -configuration-extensions: -- set-hostname -- add-config-files -- nfsboot -- install-files diff --git a/systems/gitlab-server.morph b/systems/gitlab-server.morph deleted file mode 100644 index 83093ac1..00000000 --- a/systems/gitlab-server.morph +++ /dev/null @@ -1,34 +0,0 @@ -name: gitlab-server -kind: system -description: system which hosts a gitlab server -arch: x86_64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph -- name: foundation - morph: strata/foundation.morph -- name: core - morph: strata/core.morph -- name: tools - morph: strata/tools.morph -- name: nfs - morph: strata/nfs.morph -- name: databases - morph: strata/databases.morph -- name: pcre-utils - morph: strata/pcre-utils.morph -- name: webtools - morph: strata/webtools.morph -- name: ruby - morph: strata/ruby.morph -- name: gitlab - morph: strata/gitlab.morph -configuration-extensions: -- set-hostname -- add-config-files -- nfsboot -- install-files -- gitlab -- fstab diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph index b8bfe41e..84153961 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.morph @@ -14,6 +14,10 @@ strata: morph: strata/foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: installer-utils diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index 1a120ef9..ab50f7f6 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -15,6 +15,10 @@ strata: morph: strata/python-core.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: pcre-utils diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 5aea4f7b..dad3d3dc 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -33,6 +33,10 @@ strata: morph: strata/gtk2.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: xfce -- cgit v1.2.1