From dd28dcf3d620a4ac7d0a1532b812213cf094cd3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Wed, 12 Jan 2022 02:26:25 +0100 Subject: Revert "Move webdav into profiles." It actually reverts the non-need for the nginx module webdav_ext. Since Omnifocus requires PROPFIND. This reverts commit edf6ffe8b399679ba28cc5e558a6838919dd1ee8. --- modules/shiori/files/shiori.service | 13 -------- modules/shiori/manifests/init.pp | 65 ------------------------------------- 2 files changed, 78 deletions(-) delete mode 100644 modules/shiori/files/shiori.service delete mode 100644 modules/shiori/manifests/init.pp (limited to 'modules/shiori') diff --git a/modules/shiori/files/shiori.service b/modules/shiori/files/shiori.service deleted file mode 100644 index 6c8de29..0000000 --- a/modules/shiori/files/shiori.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Bookmark server - -[Service] -User=shiori -Environment=SHIORI_DIR=/var/www/shiori -Environment=PORT=8080 -EnvironmentFile=-/etc/conf.d/shiori -ExecStart=shiori serve -p $PORT -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/modules/shiori/manifests/init.pp b/modules/shiori/manifests/init.pp deleted file mode 100644 index 69d5fde..0000000 --- a/modules/shiori/manifests/init.pp +++ /dev/null @@ -1,65 +0,0 @@ -class shiori ( - $port = 8080, - $dir = '/var/www/shiori', -) { - - - # on arch this is available through the aur - package { 'shiori-bin': - ensure => installed, - } - - user { 'shiori': - ensure => present, - system => true, - home => $dir, - } - - file { $dir: - ensure => directory, - owner => shiori, - group => shiori, - mode => '0750', - } - - file { [ - "${dir}/archive", - "${dir}/thumb", - ] : - ensure => directory, - owner => shiori, - group => shiori, - mode => '0770', - } - - file { "${dir}/shiori.db": - owner => 'shiori', - group => 'shiori', - mode => '0660', - } - - file { '/etc/systemd/system/shiori.service': - ensure => file, - source => 'puppet:///modules/shiori/shiori.service', - } - - file { '/etc/conf.d/shiori': - ensure => 'file', - content => @("EOF") - # This file is managed by Puppet. - PORT=${port} - SHIORI_DIR=${dir} - | EOF - } - - service { 'shiori': - ensure => running, - enable => true, - require => [ - File['/etc/systemd/system/shiori.service'], - File['/etc/conf.d/shiori'], - ], - } - - # Users could be managed here, through shioris HTTP API -} -- cgit v1.2.3