From: Philipp Dallig Date: Tue, 19 Jul 2016 09:47:51 +0000 (+0200) Subject: rename git -> git_old X-Git-Tag: v0.1.0~4506 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=b9de0debe24b42cd4f83124b128ea8221af4c49a;p=pixelpark%2Fhiera.git rename git -> git_old --- diff --git a/customer/pixelpark/git.pixelpark.com.yaml b/customer/pixelpark/git.pixelpark.com.yaml deleted file mode 100644 index b26cfa99..00000000 --- a/customer/pixelpark/git.pixelpark.com.yaml +++ /dev/null @@ -1,57 +0,0 @@ ---- -site::role: base -site::additional_classes: - - nginx - - gitlab - -gitlab::git_user: git -gitlab::git_home: '/srv/git' -gitlab::git_email: webmaster@pixelpark.com -gitlab::git_comment: GitLab -gitlab::gitlab_sources: https://github.com/gitlabhq/gitlabhq.git -gitlab::gitlab_branch: '7-11-stable' -gitlab::gitlabshell_sources: https://github.com/gitlabhq/gitlab-shell.git -gitlab::gitlabshell_branch: 'v2.6.3' -gitlab::proxy_name: 'gitlab' -gitlab::gitlab_dbtype: pgsql -gitlab::gitlab_dbname: gitlab -gitlab::gitlab_dbuser: gitlab -gitlab::gitlab_dbpwd: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAo1CBi/Y6gKL3BbCQLxExZK4cxTayybguJWyPcmvhKBlDw5NCe2lW0jHn/kqct8jVTG+0cMs9XTSwLa0Xi+RunljKadqjMso0XYDaHGLvyDK7MBNABvCC++/iqz74E9YYea8aFROrN2meZMLuk2vs59cmX9MlyBEBrOXOs7LjYOxi/R9OZJBFKWMJAYEdb8w/Q+aAHLyaxocbuFU31226N7GF54Ko01K5MSWCy1mAXvPh6PfBNOxzm/ibJmDI6KV60xNUYug+9sLWovSDfKz5mnTXNRYzuGlMwD3jAGbELvQ9Nc95CB5fmnHLXaCndIK4j+tKN/z/BVt1xHd6lZNhRzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBjHqVRXvnvcJFWgEMKBVqWgCDaxmesLbHyk/nkKWPw3NaM2kFXe00hHIpaUMd4ORKsqw==] -gitlab::gitlab_dbhost: psql-pp01.pixelpark.net -gitlab::gitlab_dbport: '5432' -gitlab::gitlab_domain: 'git.pixelpark.com' -gitlab::gitlab_domain_alias: false -gitlab::gitlab_repodir: '/srv/git' -gitlab::gitlab_satellitedir: '/srv/git' -gitlab::gitlab_backup: false # really? -gitlab::gitlab_backup_path: 'tmp/backups' # (relative to $git_home) -gitlab::gitlab_backup_keep_time: 0 -#gitlab::gitlab_backup_time: fqdn_rand(5)+1 -gitlab::gitlab_backup_postscript: false -gitlab::gitlab_ssl: true -gitlab::gitlab_ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem' -gitlab::gitlab_ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.com-key.pem' -gitlab::gitlab_ssl_self_signed: false -gitlab::gitlab_projects: '10' -gitlab::gitlab_username_change: true -gitlab::gitlab_unicorn_listen: 127.0.0.1 -gitlab::gitlab_unicorn_port: '8080' -gitlab::gitlab_unicorn_worker: '2' -gitlab::gitlab_bundler_flags: '--deployment' -gitlab::gitlab_manage_rbenv: false -gitlab::gitlab_ruby_version: '2.0.0' -#gitlab::exec_path: '${git_home}/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' -gitlab::gitlab_bundler_jobs: '1' -gitlab::gitlab_ensure_postfix: true -gitlab::gitlab_ensure_curl: true -gitlab::ldap_enabled: true -gitlab::ldap_host: 'ldap.pixelpark.com' -gitlab::ldap_base: 'ou=People,o=Pixelpark,o=isp' -gitlab::ldap_uid: 'uid' -gitlab::ldap_port: '636' -gitlab::ldap_method: ssl -gitlab::ldap_bind_dn: 'uid=wwwadm,ou=wwwserver,ou=applications,o=pixelpark,o=isp' -gitlab::ldap_bind_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAE1PZB6R9r8U7IStlVOFk6WtD0YnmdaVMshSzwzA5tCttwxF1Fne4UvGUvG8IJTagcQ+L+87xwvJ4cW2lGdkGdfqMTeofhEqEW3GxuprVusDtvj1mMq3a5Ge9f8ACa81/xvfLeI+kUfw5JaD88IaaTyPEE2uPPN0ycYdJKdB5b1jkuotVsIk4XBoCdg+3bhhixrC+rdiOn0x9jQJyIVANhNdyyc5ivEzd3mXS0QLmsBZhngskWLen82lKjgJCo1jPhH4TSvm5bpzgrcp3Z0lB2xnM/2j29wt3Qa7YrJfVbtx2lkXOcwDNTMxik00fhSLEEVrRUnO/QIhNHvqCUvc74TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBCrHy99tyP3PtCncgP9Uf4gBCW5wWkR6k93gEXyIvI5bf/] -gitlab::ssh_port: '22' -gitlab::google_analytics_id: '' -gitlab::webserver_service_name: nginx diff --git a/customer/pixelpark/git_old.pixelpark.com.yaml b/customer/pixelpark/git_old.pixelpark.com.yaml new file mode 100644 index 00000000..0a823ada --- /dev/null +++ b/customer/pixelpark/git_old.pixelpark.com.yaml @@ -0,0 +1,55 @@ +--- +site::role: base + + +gitlab::git_user: git +gitlab::git_home: '/srv/git' +gitlab::git_email: webmaster@pixelpark.com +gitlab::git_comment: GitLab +gitlab::gitlab_sources: https://github.com/gitlabhq/gitlabhq.git +gitlab::gitlab_branch: '7-11-stable' +gitlab::gitlabshell_sources: https://github.com/gitlabhq/gitlab-shell.git +gitlab::gitlabshell_branch: 'v2.6.3' +gitlab::proxy_name: 'gitlab' +gitlab::gitlab_dbtype: pgsql +gitlab::gitlab_dbname: gitlab +gitlab::gitlab_dbuser: gitlab +gitlab::gitlab_dbpwd: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAo1CBi/Y6gKL3BbCQLxExZK4cxTayybguJWyPcmvhKBlDw5NCe2lW0jHn/kqct8jVTG+0cMs9XTSwLa0Xi+RunljKadqjMso0XYDaHGLvyDK7MBNABvCC++/iqz74E9YYea8aFROrN2meZMLuk2vs59cmX9MlyBEBrOXOs7LjYOxi/R9OZJBFKWMJAYEdb8w/Q+aAHLyaxocbuFU31226N7GF54Ko01K5MSWCy1mAXvPh6PfBNOxzm/ibJmDI6KV60xNUYug+9sLWovSDfKz5mnTXNRYzuGlMwD3jAGbELvQ9Nc95CB5fmnHLXaCndIK4j+tKN/z/BVt1xHd6lZNhRzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBjHqVRXvnvcJFWgEMKBVqWgCDaxmesLbHyk/nkKWPw3NaM2kFXe00hHIpaUMd4ORKsqw==] +gitlab::gitlab_dbhost: psql-pp01.pixelpark.net +gitlab::gitlab_dbport: '5432' +gitlab::gitlab_domain: 'git.pixelpark.com' +gitlab::gitlab_domain_alias: false +gitlab::gitlab_repodir: '/srv/git' +gitlab::gitlab_satellitedir: '/srv/git' +gitlab::gitlab_backup: false # really? +gitlab::gitlab_backup_path: 'tmp/backups' # (relative to $git_home) +gitlab::gitlab_backup_keep_time: 0 +#gitlab::gitlab_backup_time: fqdn_rand(5)+1 +gitlab::gitlab_backup_postscript: false +gitlab::gitlab_ssl: true +gitlab::gitlab_ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem' +gitlab::gitlab_ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.com-key.pem' +gitlab::gitlab_ssl_self_signed: false +gitlab::gitlab_projects: '10' +gitlab::gitlab_username_change: true +gitlab::gitlab_unicorn_listen: 127.0.0.1 +gitlab::gitlab_unicorn_port: '8080' +gitlab::gitlab_unicorn_worker: '2' +gitlab::gitlab_bundler_flags: '--deployment' +gitlab::gitlab_manage_rbenv: false +gitlab::gitlab_ruby_version: '2.0.0' +#gitlab::exec_path: '${git_home}/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' +gitlab::gitlab_bundler_jobs: '1' +gitlab::gitlab_ensure_postfix: true +gitlab::gitlab_ensure_curl: true +gitlab::ldap_enabled: true +gitlab::ldap_host: 'ldap.pixelpark.com' +gitlab::ldap_base: 'ou=People,o=Pixelpark,o=isp' +gitlab::ldap_uid: 'uid' +gitlab::ldap_port: '636' +gitlab::ldap_method: ssl +gitlab::ldap_bind_dn: 'uid=wwwadm,ou=wwwserver,ou=applications,o=pixelpark,o=isp' +gitlab::ldap_bind_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAE1PZB6R9r8U7IStlVOFk6WtD0YnmdaVMshSzwzA5tCttwxF1Fne4UvGUvG8IJTagcQ+L+87xwvJ4cW2lGdkGdfqMTeofhEqEW3GxuprVusDtvj1mMq3a5Ge9f8ACa81/xvfLeI+kUfw5JaD88IaaTyPEE2uPPN0ycYdJKdB5b1jkuotVsIk4XBoCdg+3bhhixrC+rdiOn0x9jQJyIVANhNdyyc5ivEzd3mXS0QLmsBZhngskWLen82lKjgJCo1jPhH4TSvm5bpzgrcp3Z0lB2xnM/2j29wt3Qa7YrJfVbtx2lkXOcwDNTMxik00fhSLEEVrRUnO/QIhNHvqCUvc74TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBCrHy99tyP3PtCncgP9Uf4gBCW5wWkR6k93gEXyIvI5bf/] +gitlab::ssh_port: '22' +gitlab::google_analytics_id: '' +gitlab::webserver_service_name: nginx