Compare commits

..

No commits in common. "5c0e05394dec63648d7d78af4868b6b8abbc4323" and "d3e0f41ff1aac66a99ddb285558aa1380f98b7f8" have entirely different histories.

2 changed files with 7 additions and 7 deletions

View file

@ -198,14 +198,14 @@ define sunetdrive::app_type (
force => true, force => true,
owner => 'www-data', owner => 'www-data',
group => 'root', group => 'root',
mode => '0640', mode => '0644',
} }
file { '/opt/nextcloud/audit.log': file { '/opt/nextcloud/audit.log':
ensure => file, ensure => file,
force => true, force => true,
owner => 'www-data', owner => 'www-data',
group => 'root', group => 'root',
mode => '0640', mode => '0644',
} }
file { '/opt/nextcloud/rclone.conf': file { '/opt/nextcloud/rclone.conf':
ensure => file, ensure => file,

View file

@ -16,14 +16,14 @@ class sunetdrive::onlyoffice () {
command => "docker login registry.gitlab.collabora.com -u ${token_name} -p ${access_token}", command => "docker login registry.gitlab.collabora.com -u ${token_name} -p ${access_token}",
} }
sunet::collabora::docs { 'sunet-onlyoffice': sunet::collabora::docs { 'sunet-onlyoffice':
dns => [ '89.32.32.32' ], dns => [ '89.32.32.32' ],
extra_hosts => $extra_hosts, extra_hosts => $extra_hosts,
extra_volumes => ['/opt/collabora/coolwsd.xml:/etc/coolwsd/coolwsd.xml'], extra_volumes => ['/opt/collabora/coolwsd.xml:/etc/coolwsd/coolwsd.xml'],
docker_tag => $docker_tag, docker_tag => $docker_tag,
docker_image => 'registry.gitlab.collabora.com/productivity/collabora-online-nc', docker_image => 'registry.gitlab.collabora.com/productivity/collabora-online-nc',
} }
file {'/opt/collabora/coolwsd.xml': file {'/opt/collabora/coolwsd.xml':
ensure => present, ensure => present,
content => template('sunetdrive/document/coolwsd.xml.erb'), content => template('sunetdrive/document/coolwsd.xml.erb'),
} }
} }