diff options
| author | Jesse Luehrs <doy@tozt.net> | 2020-04-28 03:03:56 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2020-04-28 03:03:56 -0400 |
| commit | 98c6c4edd7978cdb26ade4bcdb3eaeefab22040a (patch) | |
| tree | 97749e834c9f3a80164d45a014cfa63943357896 | |
| parent | 175c145fed9b68ceb6efe9fdd08b442d05fa3285 (diff) | |
| download | puppet-tozt-98c6c4edd7978cdb26ade4bcdb3eaeefab22040a.tar.gz puppet-tozt-98c6c4edd7978cdb26ade4bcdb3eaeefab22040a.zip | |
more path fiddling
| -rw-r--r-- | modules/gitea/files/override.conf | 3 | ||||
| -rw-r--r-- | modules/gitea/manifests/init.pp | 33 |
2 files changed, 9 insertions, 27 deletions
diff --git a/modules/gitea/files/override.conf b/modules/gitea/files/override.conf index d23a8e3..acd72f5 100644 --- a/modules/gitea/files/override.conf +++ b/modules/gitea/files/override.conf @@ -1,5 +1,6 @@ [Service] -Environment=USER=gitea HOME=/media/persistent/gitea/home GITEA_WORK_DIR=/media/persistent/gitea/work GITEA_CUSTOM=/media/persistent/gitea/custom +WorkingDirectory=/media/persistent/gitea +Environment=USER=gitea HOME=/media/persistent/gitea GITEA_WORK_DIR=/media/persistent/gitea/work ReadWritePaths=/media/persistent/gitea ExecStart= ExecStart=/usr/bin/gitea web diff --git a/modules/gitea/manifests/init.pp b/modules/gitea/manifests/init.pp index 3b4aa44..fc61068 100644 --- a/modules/gitea/manifests/init.pp +++ b/modules/gitea/manifests/init.pp @@ -12,10 +12,7 @@ class gitea { Package['gitea'], File['/etc/systemd/system/gitea.service.d/override.conf'], Exec["/usr/bin/systemctl daemon-reload"], - File['/media/persistent/gitea/home'], - File['/media/persistent/gitea/work'], - File['/media/persistent/gitea/custom/conf/app.ini'], - File['/media/persistent/gitea/repos'], + File['/media/persistent/gitea/work/custom/conf/app.ini'], ]; } @@ -27,14 +24,6 @@ class gitea { ensure => directory, owner => 'gitea', group => 'gitea'; - '/media/persistent/gitea/home': - ensure => directory, - owner => 'gitea', - group => 'gitea', - require => [ - Package['gitea'], - File['/media/persistent/gitea'], - ]; '/media/persistent/gitea/work': ensure => directory, owner => 'gitea', @@ -43,35 +32,27 @@ class gitea { Package['gitea'], File['/media/persistent/gitea'], ]; - '/media/persistent/gitea/custom': + '/media/persistent/gitea/work/custom': ensure => directory, owner => 'gitea', group => 'gitea', require => [ Package['gitea'], - File['/media/persistent/gitea'], + File['/media/persistent/gitea/work'], ]; - '/media/persistent/gitea/custom/conf': + '/media/persistent/gitea/work/custom/conf': ensure => directory, owner => 'gitea', group => 'gitea', require => [ Package['gitea'], - File['/media/persistent/gitea'], + File['/media/persistent/gitea/work/custom'], ]; - '/media/persistent/gitea/custom/conf/app.ini': + '/media/persistent/gitea/work/custom/conf/app.ini': content => template('gitea/app.ini'), owner => 'gitea', group => 'gitea', - require => File['/media/persistent/gitea/custom/conf']; - '/media/persistent/gitea/repos': - ensure => directory, - owner => 'gitea', - group => 'gitea', - require => [ - Package['gitea'], - File['/media/persistent/gitea'], - ]; + require => File['/media/persistent/gitea/work/custom/conf']; '/etc/systemd/system/gitea.service.d': ensure => directory; '/etc/systemd/system/gitea.service.d/override.conf': |