We are no longer using gitit nor is wiki running off git.zulip.net.

(imported from commit fbe1bc2804a5ed6ccecb7b3090b55d7e9fa5b1bc)
This commit is contained in:
Luke Faraone 2013-07-25 15:56:00 -04:00
parent a78718e299
commit 76a58fe800
3 changed files with 0 additions and 87 deletions

View File

@ -1,39 +0,0 @@
<VirtualHost *:80>
ServerName wiki.humbughq.com
Redirect permanent / https://wiki.humbughq.com/
</VirtualHost>
<VirtualHost *:443>
ServerName wiki.humbughq.com
SSLEngine on
SSLCertificateFile /etc/apache2/certs/humbug-self-signed.crt
SSLCertificateKeyFile /etc/apache2/certs/humbug-self-signed.key
Header add Strict-Transport-Security "max-age=15768000"
Header add X-Frame-Options DENY
RewriteEngine On
ProxyPreserveHost On
ProxyRequests Off
<Proxy *>
Order deny,allow
Allow from all
AuthType Digest
AuthName "wiki"
AuthDigestProvider file
AuthUserFile /etc/apache2/users/wiki
Require valid-user
</Proxy>
ProxyPassReverse / http://127.0.0.1:5001
RewriteRule ^(.*) http://127.0.0.1:5001$1 [P]
ErrorLog /var/log/apache2/error.log
LogLevel warn
CustomLog /var/log/apache2/access.log combined
ServerSignature On
</VirtualHost>

View File

@ -1,9 +1,6 @@
class humbug::git {
class { 'humbug::base': }
# We run our wiki off of git.humbughq.com; this may change.
class { 'humbug::wiki': }
$git_packages = [ ]
package { $git_packages: ensure => "installed" }

View File

@ -1,45 +0,0 @@
class humbug::wiki {
class { 'humbug::apache': }
class { 'humbug::supervisor': }
$wiki_packages = [ "gitit", ]
package { $wiki_packages: ensure => "installed" }
apache2site { 'wiki':
require => [File['/etc/apache2/sites-available/'],
Apache2mod['headers'], Apache2mod['ssl'],
],
ensure => present,
}
group { 'wiki':
ensure => present,
gid => '1100',
}
user { 'wiki':
ensure => present,
uid => '1100',
gid => '1100',
require => Group['wiki'],
shell => '/bin/bash',
home => '/home/wiki',
managehome => true,
}
file { "/home/wiki/wiki/":
recurse => true,
owner => "wiki",
group => "wiki",
source => "puppet:///modules/humbug/wiki",
require => User['wiki'],
}
file { '/etc/supervisor/conf.d/gitit.conf':
require => Package['supervisor'],
ensure => file,
owner => 'root',
group => 'root',
mode => 640,
source => "puppet:///modules/humbug/supervisord/conf.d/gitit.conf",
notify => Service['supervisor'],
}
}