diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2008-10-24 15:20:36 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2008-10-24 15:20:36 +0000 |
| commit | f5167a60d2987c812534dccc04fa7a514aff5c19 (patch) | |
| tree | a38354ac825094124ec290bed4c79046d184224f | |
| parent | d8d070305a3f16838b95fc303a2742c6bdf96bf5 (diff) | |
| download | acf-alpine-baselayout-f5167a60d2987c812534dccc04fa7a514aff5c19.tar.bz2 acf-alpine-baselayout-f5167a60d2987c812534dccc04fa7a514aff5c19.tar.xz | |
Minor change to roles code and major change to roles. Replaced ALL, CREATE, READ, UPDATE, and DELETE with GUEST, USER, EDITOR, EXPERT, and ADMIN. Changed all roles files and modified some html files to hide options without permissions. Determine default roles from roles files, rather than hard-coded, and added ability to modify default roles by adding permissions.
git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@1563 ab2d0c66-481e-0410-8bed-d214d4d58bed
| -rw-r--r-- | alpine-baselayout.roles | 10 | ||||
| -rw-r--r-- | logfiles-status-html.lsp | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/alpine-baselayout.roles b/alpine-baselayout.roles index 31a04d0..c9b2a07 100644 --- a/alpine-baselayout.roles +++ b/alpine-baselayout.roles @@ -1,5 +1,5 @@ -CREATE=interfaces:create,interfaces:editintfile -READ=health:storage,health:proc,health:network,health:modules,health:networkstats,interfaces:status,interfaces:read,logfiles:status,logfiles:view,logfiles:download,logfiles:tail,syslog:status,syslog:loginfo,rc:status -UPDATE=hostname:edit,interfaces:update,interfaces:ifup,interfaces:ifdown,interfaces:restart,password:edit,skins:update,skins:read,syslog:startstop,syslog:config,syslog:expert,rc:edit -DELETE=interfaces:delete,logfiles:delete -ALL=health:system,hostname:read +GUEST=health:system,hostname:read +USER=health:storage,health:proc,health:network,health:modules,health:networkstats,interfaces:status,interfaces:read,interfaces:restart,logfiles:status,logfiles:view,logfiles:download,logfiles:tail,skins:update,skins:read,syslog:status,syslog:loginfo,syslog:startstop,rc:status +EDITOR=hostname:edit,interfaces:delete,interfaces:create,interfaces:update,interfaces:ifup,interfaces:ifdown,logfiles:delete,syslog:config,rc:edit +EXPERT=syslog:expert,interfaces:editintfile +ADMIN=health:system,hostname:read,health:storage,health:proc,health:network,health:modules,health:networkstats,interfaces:status,interfaces:read,interfaces:restart,logfiles:status,logfiles:view,logfiles:download,logfiles:tail,skins:update,skins:read,syslog:status,syslog:loginfo,syslog:startstop,rc:status,hostname:edit,interfaces:delete,interfaces:create,interfaces:update,interfaces:ifup,interfaces:ifdown,logfiles:delete,syslog:config,rc:edit,syslog:expert,interfaces:editintfile,password:edit diff --git a/logfiles-status-html.lsp b/logfiles-status-html.lsp index d11e16d..b4e98b4 100644 --- a/logfiles-status-html.lsp +++ b/logfiles-status-html.lsp @@ -7,7 +7,9 @@ <TABLE> <TR style="background:#eee;font-weight:bold;"> + <% if session.permissions.logfiles.delete then %> <TD style="padding-right:20px;white-space:nowrap;" class="header">Delete</TD> + <% end %> <TD style="padding-right:20px;white-space:nowrap;" class="header">View</TD> <TD style="padding-right:20px;white-space:nowrap;" class="header">Tail</TD> <TD style="padding-right:20px;white-space:nowrap;" class="header">Save</TD> @@ -18,12 +20,14 @@ <% for i,file in ipairs(view.value) do %> <TR> + <% if session.permissions.logfiles.delete then %> <TD style="padding-right:20px;white-space:nowrap;"> <% if file.value.inuse.value then %> in use <% else %> <%= html.link{value = "delete?name="..file.value.filename.value, label="Delete" } %> <% end %></TD> + <% end %> <TD style="padding-right:20px;white-space:nowrap;"><%= html.link{value = "view?name="..file.value.filename.value, label="View" } %></TD> <TD style="padding-right:20px;white-space:nowrap;"><%= html.link{value = "tail?name="..file.value.filename.value, label="Tail" } %></TD> <TD style="padding-right:20px;white-space:nowrap;"><%= html.link{value = "download?name="..file.value.filename.value, label="Download" } %></TD> |