1.1 --- a/moinsetup.py	Fri Jul 13 21:39:20 2012 +0200
     1.2 +++ b/moinsetup.py	Fri Jul 13 21:52:07 2012 +0200
     1.3 @@ -106,7 +106,7 @@
     1.4  
     1.5  postsetup_setfacl_logs = """
     1.6  if [ -e "%(common_dir)s/data/*-log" ]; then
     1.7 -    setfacl -m g:%(web_group)s:rw %(common_dir)s/data/*-log
     1.8 +    setfacl -m u:%(web_user)s:rw %(common_dir)s/data/*-log
     1.9  fi
    1.10  """
    1.11  
    1.12 @@ -368,10 +368,10 @@
    1.13          "url_path", "static_url_path"
    1.14          )
    1.15  
    1.16 -    # NOTE: Need to detect Web server user.
    1.17 +    # NOTE: Potentially detect Web server credentials.
    1.18  
    1.19 -    web_user = "www-data"
    1.20 -    web_group = "www-data"
    1.21 +    web_user_default = "www-data"
    1.22 +    web_group_default = "www-data"
    1.23  
    1.24      # MoinMoin resources.
    1.25  
    1.26 @@ -382,6 +382,7 @@
    1.27          moin_distribution=None,
    1.28          prefix=None, site_packages=None,
    1.29          web_app_dir=None, web_static_dir=None, web_site_dir=None,
    1.30 +        web_user=None, web_group=None,
    1.31          common_dir=None, farm_config=None, site_config=None,
    1.32          url_path=None, static_url_path=None,
    1.33          superuser=None, site_name=None, site_identifier=None, front_page_name=None,
    1.34 @@ -404,6 +405,8 @@
    1.35            * web_site_dir      - optional: the directory where Web site
    1.36                                  definitions reside (such as
    1.37                                  /etc/apache2/sites-available)
    1.38 +          * web_user          - optional: the user operating the Web server
    1.39 +          * web_group         - optional: the group of the Web server user
    1.40  
    1.41          The following site settings are also applicable:
    1.42  
    1.43 @@ -438,6 +441,9 @@
    1.44          self.site_config = site_config
    1.45          self.theme_default = theme_default
    1.46  
    1.47 +        self.web_user = web_user or self.web_user_default
    1.48 +        self.web_group = web_group or self.web_group_default
    1.49 +
    1.50          # NOTE: Support the detection of the Apache sites directory.
    1.51  
    1.52          self.prefix, self.site_packages, self.web_app_dir, self.web_site_dir, self.web_static_dir, self.common_dir = \