Ignore:
Timestamp:
17/01/11 10:24:33 (9 years ago)
Author:
pjkersha
Message:

Incomplete - task 16: NDG Security 2.x.x - incl. updated Paster templates

  • major progress on independent OpenID Provider template. Requires some fixes to Yadis templates to complete.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/paster_templates/Makefile

    r7796 r7817  
    205205OP_DEST_DIR = ${DEST_DIR}${OP_DIRNAME} 
    206206OP_INI_FILENAME = service.ini 
    207 OP_INI_FILEPATH_TMP = ${OP_DEST_DIR}${OP_INI_FILENAME} 
    208 OP_INI_TMPL_FILEPATH = ${OP_INI_FILEPATH_TMP}_tmpl 
     207OP_INI_FILEPATH_TMP = ${OP_DEST_DIR}openidprovider.ini 
     208OP_INI_TMPL_FILEPATH = ${OP_DEST_DIR}${OP_INI_FILENAME}_tmpl 
    209209OP_PKI_DEST_DIR = ${OP_DEST_DIR}pki/ 
    210210OP_CA_DEST_DIR = ${OP_PKI_DEST_DIR}ca/ 
     211OP_CONFIG_FILES = templates openidprovider.ini public 
     212OP_TMPL_DIR = ${OP_DEST_DIR}templates/ 
     213OP_SERVER_YADIS_TMPL_FILEPATH_TMP = ${OP_TMPL_DIR}serveryadis.xml 
     214OP_SERVER_YADIS_TMPL_FILEPATH = ${OP_SERVER_YADIS_TMPL_FILEPATH_TMP}_tmpl 
     215OP_YADIS_TMPL_FILEPATH_TMP = ${OP_TMPL_DIR}yadis.xml 
     216OP_YADIS_TMPL_FILEPATH = ${OP_YADIS_TMPL_FILEPATH_TMP}_tmpl 
    211217 
    212218 
     
    216222        @-echo Copying templates, CSS and graphics and ini file ... 
    217223        mkdir ${OP_DEST_DIR} 
    218         cp -r ${OP_SRC_DIR}openidprovider/templates/ ${OP_DEST_DIR} 
    219         cp -r ${OP_SRC_DIR}public ${OP_DEST_DIR} 
    220         cp ${OP_SRC_DIR}securityservices.ini ${OP_INI_FILEPATH_TMP} 
     224        mkdir ${OP_DEST_DIR}log 
     225        @-echo Copying files ... 
     226        for i in ${OP_CONFIG_FILES} ; do \ 
     227                cp -r ${OP_SRC_DIR}$$i ${OP_DEST_DIR}; \ 
     228        done ; 
    221229        @-echo Making substitutions for template variables ... 
    222         sed -e s/'%(here)s\/openidprovider'/'%(here)s'/g \ 
    223         -e s/'testConfigDir = \.\.\/\.\.\/\.\.\/config'// \ 
    224         -e s/testConfigDir/here/g \ 
     230        sed -e s/'portNum = .*'/'portNum = %%\{portNumber}'/ \ 
     231        -e s/'baseURI =.*'/'baseURI = %%\{baseURI}'/ \ 
     232        -e s/'testConfigDir = %(here)s\/\.\.\/\.\.\/config'// \ 
     233        -e s/testConfigDir/here/g \ 
     234        -e s/'# Revision:.*'// \ 
     235        -e s/'beaker.session.secret =.*'/'beaker.session.secret = %%\{beakerSessionCookieSecret}'/ \ 
     236        -e s/\(os\.path\.join\(\'%\(here\)s\'/\(os.path.join\(\'%%\{outputDir}\'/ \ 
    225237        ${OP_INI_FILEPATH_TMP} > ${OP_INI_TMPL_FILEPATH} 
    226238        rm -f ${OP_INI_FILEPATH_TMP} 
     239        @-echo Making substitutions for Yadis templates ... 
     240        sed -r -e /'<Service priority=\"(1|19|30|20)\">'/,/'<XRD>'/d \ 
     241        -e s/'<XRD>'/'%%\{extraXrdEntries}\n    <XRD>'/ \ 
     242                ${OP_SERVER_YADIS_TMPL_FILEPATH_TMP} > \ 
     243                ${OP_SERVER_YADIS_TMPL_FILEPATH} 
     244        rm -f ${OP_SERVER_YADIS_TMPL_FILEPATH_TMP} 
     245        sed -r -e /'<Service priority=\"(1|19|30|20)\">'/,/'<XRD>'/d \ 
     246        -e s/'<XRD>'/'%%\{extraXrdEntries}\n    <XRD>'/ \ 
     247                ${OP_YADIS_TMPL_FILEPATH_TMP} > \ 
     248                ${OP_YADIS_TMPL_FILEPATH} 
     249        rm -f ${OP_YADIS_TMPL_FILEPATH_TMP} 
     250        @-echo 
     251        @-echo 
     252        @-echo Copying test SQLite user database ... 
     253        cp ${USERDB_FILEPATH} ${OP_DEST_DIR} 
    227254        @-echo 
    228255        @-echo Create PKI directory and copying files ... 
     
    233260        cp ${CA_SRC_DIR}* ${OP_CA_DEST_DIR} 
    234261        @-echo Clear out SVN directories ... 
    235         @-find ${AUTHZ_SERVICE_DEST_DIR} -name ".svn" -print | xargs /bin/rm -rf 
     262        @-find ${OP_DEST_DIR} -name ".svn" -print | xargs /bin/rm -rf 
    236263        @-echo 
    237264        @-echo Done. 
Note: See TracChangeset for help on using the changeset viewer.