Dev cleanup#12
Open
yelidrissi wants to merge 7 commits into
Open
Conversation
…ionally equivalent to the older Node.js server. Many changes were made across the project in order to achieve this.
dergachev
reviewed
Jul 25, 2018
| @@ -0,0 +1,4 @@ | |||
| PORT_PREFIX=80 | |||
| DOCKER_IMAGE=robert_gdocs | |||
Owner
There was a problem hiding this comment.
Fix prefix, perhaps gdocs_server
| @@ -1,19 +1,7 @@ | |||
| FROM ubuntu:trusty | |||
| MAINTAINER Alex Dergachev <alex@evolvingweb.ca> | |||
| FROM dergachev/gdocs-export:latest | |||
Owner
There was a problem hiding this comment.
you are killing my Dockerfile that builds dergachev/gdocs-export image. Problematic.
| COPY server/envvars /etc/apache2/envvars | ||
| COPY server/envvars /etc/apache2/envvars.bak | ||
| RUN cat /etc/apache2/envvars.bak | tr -s '\r' '\n' > /etc/apache2/envvars | ||
| RUN ["/bin/bash","-c","source /etc/apache2/envvars"] |
|
|
||
|
|
||
|
|
||
| RUN service apache2 restart |
| EXPOSE 12736 | ||
| WORKDIR /var/gdocs-export/ | ||
|
|
||
| ARG extra |
| @@ -0,0 +1,120 @@ | |||
| #!/usr/bin/env python | |||
Owner
There was a problem hiding this comment.
Remove this .bak file, it's redundant
| @@ -1,43 +1,31 @@ | |||
| #!/usr/bin/env python | |||
Owner
There was a problem hiding this comment.
separate PR please for this change
| @@ -0,0 +1,47 @@ | |||
| # envvars - default environment variables for apache2ctl | |||
| @@ -9,6 +9,81 @@ | |||
| include('includes/Message.php'); | |||
Owner
There was a problem hiding this comment.
get rid of Message.php if it's not used
| } | ||
|
|
||
| function upload() { | ||
| if(!isset($_REQUEST['id']) || !isset($_REQUEST['token'])) endit(400, "Bad Request."); |
Owner
There was a problem hiding this comment.
run through drupal code sniffer (drupalcs)
The tasks/comments/reviews as they exist here: dergachev#12 Tasks for Robert weren't dealt with.
Contributor
Author
|
The tasks assigned during the review process have been dealt with. |
robert-ngo
reviewed
Jul 25, 2018
| CMD apachectl -D FOREGROUND | ||
|
|
||
| # allow gdocs to run script as root | ||
| RUN printf "\ngdocs ALL=(root) NOPASSWD: /var/gdocs-export/server/scripts/web-convert-gdoc.sh\n" >> /etc/sudoers |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.