diff --git a/docker/docker-init.sh b/docker/docker-init.sh index e3040cb81..a80f34131 100644 --- a/docker/docker-init.sh +++ b/docker/docker-init.sh @@ -82,7 +82,6 @@ echo "Checking that there's a virtual environment for $TAG ..." if [ ! -f $VIRTDIR/bin/activate ]; then echo "Setting up python virtualenv at /opt/home/$USER ..." mkdir -p /opt/home/$USER - chown $USER /opt/home/$USER mkdir $VIRTDIR virtualenv --system-site-packages $VIRTDIR echo -e " @@ -126,6 +125,7 @@ for sub in \ developers/ietf-ftp/rfc \ developers/ietf-ftp/status-changes \ developers/ietf-ftp/yang/draftmod \ + developers/ietf-ftp/yang/ianamod \ developers/ietf-ftp/yang/invalmod \ developers/ietf-ftp/yang/rfcmod \ developers/www6s \ @@ -154,6 +154,7 @@ if [ ! -f "/home/$USER/$CWD/test/data/group-aliases" ]; then fi chown -R $USER /opt/home/$USER +chmod -R g+w /usr/local/lib/ # so we can patch libs if needed cd "/home/$USER/$CWD" || cd "/home/$USER/" diff --git a/docker/settings_local.py b/docker/settings_local.py index 9c495ec89..0737d97a2 100644 --- a/docker/settings_local.py +++ b/docker/settings_local.py @@ -31,7 +31,6 @@ EMAIL_PORT=2025 TRAC_WIKI_DIR_PATTERN = "test/wiki/%s" TRAC_SVN_DIR_PATTERN = "test/svn/%s" TRAC_CREATE_ADHOC_WIKIS = [ - ('iesg', 'Meeting', TRAC_WIKI_DIR_PATTERN % "ietf/meeting"), ] MEDIA_BASE_DIR = 'test' @@ -46,6 +45,7 @@ DOCUMENT_PATH_PATTERN = 'data/developers/ietf-ftp/{doc.type_id}/' SUBMIT_YANG_RFC_MODEL_DIR = 'data/developers/ietf-ftp/yang/rfcmod/' SUBMIT_YANG_DRAFT_MODEL_DIR = 'data/developers/ietf-ftp/yang/draftmod/' SUBMIT_YANG_INVAL_MODEL_DIR = 'data/developers/ietf-ftp/yang/invalmod/' +SUBMIT_YANG_IANA_MODEL_DIR = 'data/developers/ietf-ftp/yang/ianamod/' SUBMIT_YANGLINT_COMMAND = 'yanglint --verbose -p {rfclib} -p {draftlib} -p {tmplib} {model}'