|
Line
Link Here
|
| 0 |
-- a/WebappConfig/config.py |
0 |
++ b/WebappConfig/config.py |
|
Lines 694-699
Link Here
|
| 694 |
' variable "' + user + "'") |
694 |
' variable "' + user + "'") |
| 695 |
return result |
695 |
return result |
| 696 |
|
696 |
|
|
|
697 |
def maybe_get_user(self, user): |
| 698 |
result = None |
| 699 |
input_user = self.maybe_get(user) |
| 700 |
if not input_user: |
| 701 |
return result |
| 702 |
try: |
| 703 |
result = Perm.get_user(input_user) |
| 704 |
except KeyError: |
| 705 |
OUT.die('You specified an invalid user value for the' |
| 706 |
' variable "' + user + "'") |
| 707 |
return result |
| 708 |
|
| 697 |
def get_group(self, group): |
709 |
def get_group(self, group): |
| 698 |
result = None |
710 |
result = None |
| 699 |
try: |
711 |
try: |
|
Lines 703-708
Link Here
|
| 703 |
' variable "' + group + "'") |
715 |
' variable "' + group + "'") |
| 704 |
return result |
716 |
return result |
| 705 |
|
717 |
|
|
|
718 |
def maybe_get_group(self, group): |
| 719 |
result = None |
| 720 |
input_group = self.maybe_get(group) |
| 721 |
if not input_group: |
| 722 |
return result |
| 723 |
try: |
| 724 |
result = Perm.get_group(input_group) |
| 725 |
except KeyError: |
| 726 |
OUT.die('You specified an invalid group value for the' |
| 727 |
' variable "' + group + "'") |
| 728 |
return result |
| 729 |
|
| 706 |
def installdir(self): |
730 |
def installdir(self): |
| 707 |
return self.maybe_get('g_installdir') |
731 |
return self.maybe_get('g_installdir') |
| 708 |
|
732 |
|
|
Lines 1478-1504
Link Here
|
| 1478 |
self.get_group('vhost_default_gid'), |
1502 |
self.get_group('vhost_default_gid'), |
| 1479 |
self.get_perm('vhost_perms_virtualowned_file')], |
1503 |
self.get_perm('vhost_perms_virtualowned_file')], |
| 1480 |
# These will be re-set by the servers |
1504 |
# These will be re-set by the servers |
| 1481 |
'server-owned' : [None, |
1505 |
'server-owned' : [self.maybe_get_user('vhost_server_uid'), |
| 1482 |
None, |
1506 |
self.maybe_get_group('vhost_server_gid'), |
| 1483 |
self.get_perm('vhost_perms_serverowned_file')], |
1507 |
self.get_perm('vhost_perms_serverowned_file')], |
| 1484 |
'config-owned' : [self.get_user('vhost_config_uid'), |
1508 |
'config-owned' : [self.get_user('vhost_config_uid'), |
| 1485 |
self.get_group('vhost_config_gid'), |
1509 |
self.get_group('vhost_config_gid'), |
| 1486 |
self.get_perm('vhost_perms_configowned_file')], |
1510 |
self.get_perm('vhost_perms_configowned_file')], |
| 1487 |
'config-server-owned' : [self.get_user('vhost_config_uid'), |
1511 |
'config-server-owned' : [self.get_user('vhost_config_uid'), |
| 1488 |
None, |
1512 |
self.maybe_get_group('vhost_server_gid'), |
| 1489 |
self.get_perm('vhost_perms_serverowned_file')],}, |
1513 |
self.get_perm('vhost_perms_serverowned_file')],}, |
| 1490 |
'dir' : {'default-owned' :[self.get_user('vhost_default_uid'), |
1514 |
'dir' : {'default-owned' :[self.get_user('vhost_default_uid'), |
| 1491 |
self.get_group('vhost_default_gid'), |
1515 |
self.get_group('vhost_default_gid'), |
| 1492 |
self.get_perm('vhost_perms_defaultowned_dir')], |
1516 |
self.get_perm('vhost_perms_defaultowned_dir')], |
| 1493 |
# These will be re-set by the servers |
1517 |
# These will be re-set by the servers |
| 1494 |
'server-owned' : [None, |
1518 |
'server-owned' : [self.maybe_get_user('vhost_server_uid'), |
| 1495 |
None, |
1519 |
self.maybe_get_group('vhost_server_gid'), |
| 1496 |
self.get_perm('vhost_perms_serverowned_dir')], |
1520 |
self.get_perm('vhost_perms_serverowned_dir')], |
| 1497 |
'config-owned' : [self.get_user('vhost_config_uid'), |
1521 |
'config-owned' : [self.get_user('vhost_config_uid'), |
| 1498 |
self.get_group('vhost_config_gid'), |
1522 |
self.get_group('vhost_config_gid'), |
| 1499 |
self.get_perm('vhost_perms_configowned_dir')], |
1523 |
self.get_perm('vhost_perms_configowned_dir')], |
| 1500 |
'config-server-owned' : [self.get_user('vhost_config_uid'), |
1524 |
'config-server-owned' : [self.get_user('vhost_config_uid'), |
| 1501 |
None, |
1525 |
self.maybe_get_group('vhost_server_gid'), |
| 1502 |
self.get_perm('vhost_perms_serverowned_dir')], |
1526 |
self.get_perm('vhost_perms_serverowned_dir')], |
| 1503 |
'install-owned': [self.get_user('vhost_default_uid'), |
1527 |
'install-owned': [self.get_user('vhost_default_uid'), |
| 1504 |
self.get_group('vhost_default_gid'), |
1528 |
self.get_group('vhost_default_gid'), |
| 1505 |
-- a/WebappConfig/server.py |
1529 |
++ b/WebappConfig/server.py |
|
Lines 67-81
Link Here
|
| 67 |
self.__vhostroot = directories['vhostroot'] |
67 |
self.__vhostroot = directories['vhostroot'] |
| 68 |
|
68 |
|
| 69 |
# + server owned |
69 |
# + server owned |
| 70 |
permissions['file']['server-owned'][0] = self.vhost_server_uid |
70 |
if permissions['file']['server-owned'][0] == 0: |
| 71 |
permissions['file']['server-owned'][1] = self.vhost_server_gid |
71 |
permissions['file']['server-owned'][0] = self.vhost_server_uid |
| 72 |
permissions['dir']['server-owned'][0] = self.vhost_server_uid |
72 |
permissions['dir']['server-owned'][0] = self.vhost_server_uid |
| 73 |
permissions['dir']['server-owned'][1] = self.vhost_server_gid |
73 |
if permissions['file']['server-owned'][1] == 0: |
| 74 |
# and config owned directories have server gid |
74 |
permissions['file']['server-owned'][1] = self.vhost_server_gid |
| 75 |
permissions['dir']['config-owned'][1] = self.vhost_server_gid |
75 |
permissions['dir']['server-owned'][1] = self.vhost_server_gid |
| 76 |
# allows server and config owned |
76 |
# and config owned directories have server gid |
| 77 |
permissions['file']['config-server-owned'][1] = self.vhost_server_gid |
77 |
permissions['dir']['config-owned'][1] = self.vhost_server_gid |
| 78 |
permissions['dir']['config-server-owned'][1] = self.vhost_server_gid |
78 |
# allows server and config owned |
|
|
79 |
permissions['file']['config-server-owned'][1] = self.vhost_server_gid |
| 80 |
permissions['dir']['config-server-owned'][1] = self.vhost_server_gid |
| 79 |
|
81 |
|
| 80 |
self.__perm = permissions |
82 |
self.__perm = permissions |
| 81 |
self.__handler = handler |
83 |
self.__handler = handler |
| 82 |
-- a/doc/webapp-config.5.xml |
84 |
++ b/doc/webapp-config.5.xml |
|
Lines 118-123
Link Here
|
| 118 |
</varlistentry> |
118 |
</varlistentry> |
| 119 |
|
119 |
|
| 120 |
<varlistentry> |
120 |
<varlistentry> |
|
|
121 |
<term>vhost_server_uid</term> |
| 122 |
<listitem> |
| 123 |
<para>Overiding parameter for the server-dependant hardcoded uid which specifies the user to own all files and directories that are server-owned.</para> |
| 124 |
<para>Warning: <command>webapp-config</command>'s <option>-s</option> switch does not overide this parameter.</para> |
| 125 |
<para>By default, this is disabled.</para> |
| 126 |
<para>This can be <emphasis>either</emphasis> the name of a user or their numerical user id.</para> |
| 127 |
</listitem> |
| 128 |
</varlistentry> |
| 129 |
|
| 130 |
<varlistentry> |
| 131 |
<term>vhost_server_gid</term> |
| 132 |
<listitem> |
| 133 |
<para>Overiding parameter for the server-dependant hardcoded gid which specifies the group to own all files and directories that are server-owned.</para> |
| 134 |
<para>Warning: <command>webapp-config</command>'s <option>-s</option> switch does not overide this parameter.</para> |
| 135 |
<para>By default, this is disabled.</para> |
| 136 |
<para>This can be <emphasis>either</emphasis> the name of a group or their numerical group id.</para> |
| 137 |
</listitem> |
| 138 |
</varlistentry> |
| 139 |
|
| 140 |
<varlistentry> |
| 121 |
<term>vhost_config_uid</term> |
141 |
<term>vhost_config_uid</term> |
| 122 |
<listitem> |
142 |
<listitem> |
| 123 |
<para>Default value when <command>webapp-config</command>'s <option>-u</option> switch hasn't been used.</para> |
143 |
<para>Default value when <command>webapp-config</command>'s <option>-u</option> switch hasn't been used.</para> |
