Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/382355 )
Change subject: start profile for wikiba.se web hosting ...................................................................... start profile for wikiba.se web hosting Bug: T99531 Change-Id: I3f9ca490788a52513ed4b89e17430706615a40f4 --- A modules/profile/manifests/microsites/wikibase.pp A modules/profile/templates/wikibase/apache-wikibase.erb A modules/role/manifests/wikibase.pp 3 files changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/382355/1 diff --git a/modules/profile/manifests/microsites/wikibase.pp b/modules/profile/manifests/microsites/wikibase.pp new file mode 100644 index 0000000..1136341 --- /dev/null +++ b/modules/profile/manifests/microsites/wikibase.pp @@ -0,0 +1,28 @@ +# https://wikiba.se (T99531) +class profile::microsites::wikibase { + + include ::base::firewall + + ferm::service { 'wikibase_http': + proto => 'tcp', + port => '80', + } + + class { '::apache': } + class { '::apache::mod::headers': } + + apache::site { 'wikiba.se': + content => template('profile/wikibase/apache-wikibase.erb'), + } + + ensure_resource('file', '/srv/org', {'ensure' => 'directory' }) + ensure_resource('file', '/srv/org/wikibase', {'ensure' => 'directory' }) + + git::clone { 'wikibase/wikibase.se': + ensure => 'latest', # TODO: talk about latest vs. present + directory => '/srv/org/wikibase', + branch => 'master', # are we using master to deploy? + } + +} + diff --git a/modules/profile/templates/wikibase/apache-wikibase.erb b/modules/profile/templates/wikibase/apache-wikibase.erb new file mode 100644 index 0000000..66b5b14 --- /dev/null +++ b/modules/profile/templates/wikibase/apache-wikibase.erb @@ -0,0 +1,23 @@ +<VirtualHost: *:80> + ServerName <%= @server_name %> + ServerAdmin <%= @server_admin %> + DocumentRoot /srv/org/wikibase/ + + ServerSignature On + + LogLevel warn + ErrorLog /var/log/apache2/<%= @server_name %>.error.log + CustomLog /var/log/apache2/<%= @server_name %>.access.log wmf + + <Directory /> + Options FollowSymLinks + AllowOverride None + </Directory> + + <Directory /srv/org/wikibase> + Options Indexes FollowSymLinks MultiViews + AllowOverride None + Require all granted + </Directory> + +</VirtualHost> diff --git a/modules/role/manifests/wikibase.pp b/modules/role/manifests/wikibase.pp new file mode 100644 index 0000000..d3894fd --- /dev/null +++ b/modules/role/manifests/wikibase.pp @@ -0,0 +1,11 @@ +# wikiba.se (T99531) +class role::wikibase { + + include ::standard + + include ::profile::microsites::wikibase # upcoming https://wikiba.se + + system::role { 'wikibase': + description => 'https://wikiba.se' + } +} -- To view, visit https://gerrit.wikimedia.org/r/382355 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f9ca490788a52513ed4b89e17430706615a40f4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
