diff --git a/blog_test.service b/blog_test.service new file mode 100644 index 0000000..8a8d14d --- /dev/null +++ b/blog_test.service @@ -0,0 +1,13 @@ +[Unit] +Description=My Blargh +After=network.target + +[Service] +User=http +Group=http +WorkingDirectory=/srv/http/riotblog +ExecStart=/usr/bin/uwsgi --single-interpreter --ini /srv/http/riotblog/blog.ini +Environment="RIOTBLOG_SETTINGS=/srv/http/riotblog/riotblog_local.cfg" + +[Install] +WantedBy=multi.user.target diff --git a/fabfile.py b/fabfile.py index e70742e..74beb4c 100644 --- a/fabfile.py +++ b/fabfile.py @@ -38,6 +38,7 @@ def copyFiles(): local("cp ./src/*py ./build/") local("cp *.cfg ./build/") local("cp ./src/styles/*.css ./build/styles/") + local("cp ./src/images/*png ./build/images/") local("uglifycss ./build/styles/*css > ./build/styles/primop.min.css") local("cp -r ./src/templates ./build/templates") @@ -48,8 +49,11 @@ def upload(): @task def serveUp(): + sudo("rm -rf /srv/http/riotblog_static") sudo("rm -fr /srv/http/riotblog") - sudo("cp -r /home/wes/build /srv/http/riotblog") + sudo("mkdir -p /srv/http/riotblog_static") + sudo("cp -r /home/wes/build/ /srv/http/riotblog/") + sudo("cp -r /home/wes/build/{styles,scripts,images} /srv/http/riotblog_static") sudo("cp /home/wes/build/blog.service /etc/systemd/system/blog.service") sudo("systemctl daemon-reload") sudo("systemctl enable blog.service") @@ -59,7 +63,7 @@ def serveUp(): @task(default=True) def build(): local("rm -rf ./build") - local("mkdir -p build/{scripts,styles}") + local("mkdir -p build/{scripts,styles,images}") buildScss() buildJS() copyFiles() @@ -69,7 +73,7 @@ def build(): @task def update(): - local("mkdir -p build/{scripts,styles}") + local("mkdir -p build/{scripts,styles,images}") buildScss() buildJS() copyFiles() @@ -79,7 +83,7 @@ def update(): @task def locbuild(): local("rm -rf ./build") - local("mkdir -p build/{scripts,styles}") + local("mkdir -p build/{scripts,styles,images}") local("cp requirements.txt ./build/requirements.txt") buildLocalVenv() buildScss() @@ -88,7 +92,7 @@ def locbuild(): local("sudo rm -fr /srv/http/riotblog") local("sudo mkdir -p /srv/http/riotblog") local("sudo cp -r ./build/* /srv/http/riotblog/") - local("sudo cp /home/wes/primop.me/blog.service /etc/systemd/system/blog.service") + local("sudo cp /home/wes/primop.me/blog_test.service /etc/systemd/system/blog.service") local("sudo systemctl daemon-reload") local("sudo systemctl enable blog.service") local("sudo systemctl restart blog.service") diff --git a/src/posts.py b/src/posts.py index 7d98adb..f829358 100644 --- a/src/posts.py +++ b/src/posts.py @@ -19,7 +19,7 @@ def get_mistune(): markdown = LocalProxy(get_mistune) class Posts: - def __init__(self, user, password, host=None, port=None): + def __init__(self, user, password, name, host=None, port=None): if host is None: host = "localhost" if port is None: @@ -29,11 +29,11 @@ class Posts: self.client.credentials = (user, password) - self.db = self.client["blog"] + self.db = self.client[name] self.iterpost = self.postIterator("blogPosts/blog-posts") - def savepost(self, title="", content="", author="", categories=[], _id=False): + def savepost(self, title="", content="", author="", categories=[], _id=False, draft=True): if _id: doc = self.db[_id] doc["title"] = title @@ -41,21 +41,26 @@ class Posts: doc["author"] = author doc["categories"] = categories doc["_id"] = _id + doc["draft"] = draft else: doc = { "title" : title, "content" : content, "author" : author, "categories" : categories, - "type" : "post" + "type" : "post", + "draft" : draft } print("post was saved %s" % doc) return jsonify(self.db.save(doc)) - def getpost(self, _id, json=True, convert=True): - results = self.db.iterview("blogPosts/blog-posts", 1, include_docs=True, startkey=_id) + def getpost(self, _id, json=True, convert=True, unpublished=False): + if unpublished: + results = self.db.iterview("blogPosts/unpublished", 1, include_docs=True, startkey=_id) + else: + results = self.db.iterview("blogPosts/blog-posts", 1, include_docs=True, startkey=_id) post = [result.doc for result in results][0] @@ -105,7 +110,7 @@ class Posts: return inner def allposts(self): - result = self.db.iterview("blogPosts/blog-posts", 10, include_docs=True) + result = self.db.iterview("blogPosts/unpublished", 10, include_docs=True) posts = [] for item in result: diff --git a/src/scripts/about.tag b/src/scripts/about.tag index c1cf288..6d2e373 100644 --- a/src/scripts/about.tag +++ b/src/scripts/about.tag @@ -7,7 +7,7 @@ I'm a full stack application developer who builds web and mobile apps. I am a huge fan of functional programming, compilers, and solving problems creatively and efficiently. I enjoy helping other people learn more, and I am constantly learning as well. This blog covers my thoughts on everything from computer science, psychology, philosophy, economics, and anything else I'm currently interested in.
- Feel free to shoot me an email if you want to chat or check out my resume + Feel free to shoot me an email if you want to chat or check out my profile on stack overflow