moinsetup

Changeset

62:d51fbd8f05ca
2012-07-13 Paul Boddie raw files shortlog changelog graph Added support for changing the ownership/permissions of wikiconfig.py in the post-installation scripts. Removed leading newlines from the output files. Improved the farm_config and site_config descriptions.
README.txt (file) moinsetup.py (file)
     1.1 --- a/README.txt	Tue Jul 10 22:59:25 2012 +0200
     1.2 +++ b/README.txt	Fri Jul 13 21:39:20 2012 +0200
     1.3 @@ -126,11 +126,13 @@
     1.4  farm_config         A specific Wiki farm configuration file for multiple Wiki
     1.5                      deployments. This overrides the 'common_dir' setting if
     1.6                      used, indicating that a Wiki farm configuration must be
     1.7 -                    edited when configuring a Wiki.
     1.8 +                    edited when configuring a Wiki, and must refer to an
     1.9 +                    actual file, not merely a directory.
    1.10  
    1.11  site_config         A specific configuration file location for a Wiki deployed
    1.12                      within a Wiki farm. This overrides the 'common_dir' setting
    1.13 -                    if used.
    1.14 +                    if used, and must refer to an actual file, not merely a
    1.15 +                    directory.
    1.16  
    1.17  url_path            The URL path (after the host details) of the Wiki.
    1.18  
     2.1 --- a/moinsetup.py	Tue Jul 10 22:59:25 2012 +0200
     2.2 +++ b/moinsetup.py	Fri Jul 13 21:39:20 2012 +0200
     2.3 @@ -52,11 +52,11 @@
     2.4  
     2.5  # Templates for Apache site definitions.
     2.6  
     2.7 -apache_site = """
     2.8 +apache_site = """\
     2.9  ScriptAlias %(url_path)s "%(web_app_dir)s/moin.cgi"
    2.10  """
    2.11  
    2.12 -apache_site_extra = """
    2.13 +apache_site_extra = """\
    2.14  Alias %(static_url_resources_path)s "%(htdocs_dir)s/"
    2.15  """
    2.16  
    2.17 @@ -76,7 +76,7 @@
    2.18  # Such a directive is not desirable where the static and dynamic resources are
    2.19  # in different places, however.
    2.20  
    2.21 -apache_htaccess_combined_mod_rewrite = """
    2.22 +apache_htaccess_combined_mod_rewrite = """\
    2.23  DirectoryIndex %(url_path)s/moin.cgi/
    2.24  RewriteEngine On
    2.25  RewriteBase %(final_url_path)s
    2.26 @@ -87,12 +87,16 @@
    2.27  
    2.28  # Post-setup templates.
    2.29  
    2.30 -postsetup_setfacl = """#!/bin/sh
    2.31 +postsetup_setfacl = """\
    2.32 +#!/bin/sh
    2.33  
    2.34  find '%(common_dir)s/data' -type f | xargs setfacl -m u:%(web_user)s:rw
    2.35  find '%(common_dir)s/data' -type d | xargs setfacl -m u:%(web_user)s:rwx
    2.36  find '%(common_dir)s/underlay' -type f | xargs setfacl -m u:%(web_user)s:rw
    2.37  find '%(common_dir)s/underlay' -type d | xargs setfacl -m u:%(web_user)s:rwx
    2.38 +if [ -e "%(common_dir)s/wikiconfig.py" ]; then
    2.39 +    setfacl -m u:%(web_user)s:r '%(common_dir)s/wikiconfig.py'
    2.40 +fi
    2.41  """
    2.42  
    2.43  postsetup_setfacl_extra = """
    2.44 @@ -106,12 +110,17 @@
    2.45  fi
    2.46  """
    2.47  
    2.48 -postsetup_chown_chmod = """#!/bin/sh
    2.49 +postsetup_chown_chmod = """\
    2.50 +#!/bin/sh
    2.51  
    2.52  chown -R %(this_user)s.%(web_group)s '%(common_dir)s/data'
    2.53  chown -R %(this_user)s.%(web_group)s '%(common_dir)s/underlay'
    2.54  chmod -R g+w '%(common_dir)s/data'
    2.55  chmod -R g+w '%(common_dir)s/underlay'
    2.56 +if [ -e "%(common_dir)s/wikiconfig.py" ]; then
    2.57 +    chown %(this_user)s.%(web_group)s '%(common_dir)s/wikiconfig.py'
    2.58 +    chmod g+r '%(common_dir)s/wikiconfig.py'
    2.59 +fi
    2.60  """
    2.61  
    2.62  postsetup_chown_extra = """
    2.63 @@ -369,8 +378,10 @@
    2.64      theme_master = "modernized"
    2.65      extra_theme_css_files = ["SlideShow.css"]
    2.66  
    2.67 -    def __init__(self, moin_distribution=None, prefix=None,
    2.68 -        site_packages=None, web_app_dir=None, web_static_dir=None, web_site_dir=None,
    2.69 +    def __init__(self,
    2.70 +        moin_distribution=None,
    2.71 +        prefix=None, site_packages=None,
    2.72 +        web_app_dir=None, web_static_dir=None, web_site_dir=None,
    2.73          common_dir=None, farm_config=None, site_config=None,
    2.74          url_path=None, static_url_path=None,
    2.75          superuser=None, site_name=None, site_identifier=None, front_page_name=None,